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

try handle spn's better

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@13895 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2004-06-01 15:08:29 +00:00
parent 4948cdce57
commit ac337eb057
1 changed files with 30 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
lib/kadm5/ad.c
View File

@@ -563,10 +563,10 @@ kadm5_ad_create_principal(void *server_handle,
#ifdef OPENLDAP #ifdef OPENLDAP
LDAPMod *attrs[7], rattrs[6], *a; LDAPMod *attrs[7], rattrs[6], *a;
char *useraccvals[2] = { NULL, NULL }, char *useraccvals[2] = { NULL, NULL },
*samvals[2], *dnsvals[2], *spnvals[4], *tv[2]; *samvals[2], *dnsvals[2], *spnvals[5], *tv[2];
char *ocvals_spn[] = { "top", "person", "organizationalPerson", char *ocvals_spn[] = { "top", "person", "organizationalPerson",
"user", "computer", NULL}; "user", "computer", NULL};
char *p, *realmless_p, *dn = NULL; char *p, *realmless_p, *p_msrealm = NULL, *dn = NULL;
const char *fqdn; const char *fqdn;
char *s, *samname = NULL, *short_spn = NULL; char *s, *samname = NULL, *short_spn = NULL;
int ret, i; int ret, i;
@@ -634,19 +634,26 @@ kadm5_ad_create_principal(void *server_handle,
errno = ENOMEM; errno = ENOMEM;
goto out; goto out;
} }
{ s = strchr(short_spn, '.');
char *p1, *p2; if (s) {
*s = '\0';
p1 = strchr(short_spn, '.'); } else {
p2 = strrchr(short_spn, '@');
if (p1 == NULL && p2 == NULL) {
free(short_spn); free(short_spn);
short_spn = NULL; short_spn = NULL;
} else {
memmove(p1, p2, strlen(p2) + 1);
}
} }
p_msrealm = strdup(p);
if (p_msrealm == NULL) {
errno = ENOMEM;
goto out;
}
s = strrchr(p_msrealm, '@');
if (s) {
*s = '/';
} else {
free(p_msrealm);
p_msrealm = NULL;
}
asprintf(&dn, "cn=%s, cn=Computers, %s", fqdn, CTX2BASE(context)); asprintf(&dn, "cn=%s, cn=Computers, %s", fqdn, CTX2BASE(context));
if (dn == NULL) { if (dn == NULL) {
@@ -688,10 +695,14 @@ kadm5_ad_create_principal(void *server_handle,
a->mod_op = LDAP_MOD_ADD; a->mod_op = LDAP_MOD_ADD;
a->mod_type = "servicePrincipalName"; a->mod_type = "servicePrincipalName";
a->mod_values = spnvals; a->mod_values = spnvals;
spnvals[0] = p; i = 0;
spnvals[1] = realmless_p; spnvals[i++] = p;
spnvals[2] = short_spn; /* possibly NULL */ spnvals[i++] = realmless_p;
spnvals[3] = NULL; if (short_spn)
spnvals[i++] = short_spn;
if (p_msrealm)
spnvals[i++] = p_msrealm;
spnvals[i++] = NULL;
a++; a++;
a->mod_op = LDAP_MOD_ADD; a->mod_op = LDAP_MOD_ADD;
@@ -749,6 +760,8 @@ kadm5_ad_create_principal(void *server_handle,
free(samname); free(samname);
if (short_spn) if (short_spn)
free(short_spn); free(short_spn);
if (p_msrealm)
free(p_msrealm);
free(p); free(p);
if (check_ldap(context, ret)) if (check_ldap(context, ret))