oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

use new tsasl interface

Browse Source 
remove debug printf
add upn to computer-accounts


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@14028 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2004-07-06 04:11:08 +00:00
parent fb4ab79bf4
commit 43281bd237
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lib/kadm5/ad.c
View File

@@ -131,12 +131,8 @@ ldap_tsasl_bind_s(LDAP *ld,
char **vals; char **vals;
int ret, rc; int ret, rc;
ret = tsasl_peer_init(TSASL_FLAGS_INITIATOR | ret = tsasl_peer_init(TSASL_FLAGS_INITIATOR | TSASL_FLAGS_CLEAR,
TSASL_FLAGS_CONFIDENTIALITY | "ldap", host, &peer);
TSASL_FLAGS_INTEGRITY,
"ldap",
host,
&peer);
if (ret != TSASL_DONE) { if (ret != TSASL_DONE) {
rc = LDAP_LOCAL_ERROR; rc = LDAP_LOCAL_ERROR;
goto out; goto out;
@@ -577,9 +573,9 @@ kadm5_ad_create_principal(void *server_handle,
*/ */
#ifdef OPENLDAP #ifdef OPENLDAP
LDAPMod *attrs[7], rattrs[6], *a; LDAPMod *attrs[8], rattrs[7], *a;
char *useraccvals[2] = { NULL, NULL }, char *useraccvals[2] = { NULL, NULL },
*samvals[2], *dnsvals[2], *spnvals[5], *tv[2]; *samvals[2], *dnsvals[2], *spnvals[5], *upnvals[2], *tv[2];
char *ocvals_spn[] = { "top", "person", "organizationalPerson", char *ocvals_spn[] = { "top", "person", "organizationalPerson",
"user", "computer", NULL}; "user", "computer", NULL};
char *p, *realmless_p, *p_msrealm = NULL, *dn = NULL; char *p, *realmless_p, *p_msrealm = NULL, *dn = NULL;
@@ -721,10 +717,17 @@ kadm5_ad_create_principal(void *server_handle,
spnvals[i++] = NULL; spnvals[i++] = NULL;
a++; a++;
a->mod_op = LDAP_MOD_ADD;
a->mod_type = "userPrincipalName";
a->mod_values = upnvals;
upnvals[0] = p;
upnvals[1] = NULL;
a++;
a->mod_op = LDAP_MOD_ADD; a->mod_op = LDAP_MOD_ADD;
a->mod_type = "accountExpires"; a->mod_type = "accountExpires";
a->mod_values = tv; a->mod_values = tv;
tv[0] = "116444736000000000"; /* "never" */ tv[0] = "9223372036854775807"; /* "never" */
tv[1] = NULL; tv[1] = NULL;
a++; a++;
@@ -750,15 +753,15 @@ kadm5_ad_create_principal(void *server_handle,
a->mod_op = LDAP_MOD_ADD; a->mod_op = LDAP_MOD_ADD;
a->mod_type = "userPrincipalName"; a->mod_type = "userPrincipalName";
a->mod_values = spnvals; a->mod_values = upnvals;
spnvals[0] = p; upnvals[0] = p;
spnvals[1] = NULL; upnvals[1] = NULL;
a++; a++;
a->mod_op = LDAP_MOD_ADD; a->mod_op = LDAP_MOD_ADD;
a->mod_type = "accountExpires"; a->mod_type = "accountExpires";
a->mod_values = tv; a->mod_values = tv;
tv[0] = "116444736000000000"; /* "never" */ tv[0] = "9223372036854775807"; /* "never" */
tv[1] = NULL; tv[1] = NULL;
a++; a++;
} }
@@ -1001,7 +1004,6 @@ kadm5_ad_get_principal(void *server_handle,
} }
ldap_msgfree(m); ldap_msgfree(m);
} else { } else {
printf("no entry\n");
return KADM5_UNK_PRINC; return KADM5_UNK_PRINC;
} }