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

if its the entry just contains the structural object (no samba nor

Browse Source 
heimdal object), add an aux heimdal object on to it.


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@13917 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2004-06-05 12:03:18 +00:00
parent 4a712fedb8
commit edb7f2e0f2
1 changed files with 32 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
lib/hdb/hdb-ldap.c
View File

@@ -398,6 +398,8 @@ LDAP_entry2mods(krb5_context context, HDB * db, hdb_entry * ent,
hdb_entry orig; hdb_entry orig;
unsigned long oflags, nflags; unsigned long oflags, nflags;
*pmods = NULL;
krb5_boolean is_samba_account = FALSE; krb5_boolean is_samba_account = FALSE;
krb5_boolean is_account = FALSE; krb5_boolean is_account = FALSE;
krb5_boolean is_heimdal_entry = FALSE; krb5_boolean is_heimdal_entry = FALSE;
@@ -405,6 +407,7 @@ LDAP_entry2mods(krb5_context context, HDB * db, hdb_entry * ent,
if (msg != NULL) { if (msg != NULL) {
char **values; char **values;
ret = LDAP_message2entry(context, db, msg, &orig); ret = LDAP_message2entry(context, db, msg, &orig);
if (ret) if (ret)
goto out; goto out;
@@ -428,22 +431,41 @@ LDAP_entry2mods(krb5_context context, HDB * db, hdb_entry * ent,
} }
ldap_value_free(values); ldap_value_free(values);
} }
} else {
/*
* If this is just a "account" entry and no other objectclass
* is hanging on this entry, its really a new entry.
*/
if (is_samba_account == FALSE && is_heimdal_principal == FALSE &&
is_heimdal_entry == FALSE) {
if (is_account == TRUE) {
is_new_entry = TRUE;
} else {
ret = HDB_ERR_NOENTRY;
goto out;
}
}
} else
is_new_entry = TRUE;
if (is_new_entry) {
/* to make it perfectly obvious we're depending on /* to make it perfectly obvious we're depending on
* orig being intiialized to zero */ * orig being intiialized to zero */
memset(&orig, 0, sizeof(orig)); memset(&orig, 0, sizeof(orig));
is_new_entry = TRUE;
ret = LDAP_addmod(&mods, LDAP_MOD_ADD, "objectClass", "top"); ret = LDAP_addmod(&mods, LDAP_MOD_ADD, "objectClass", "top");
if (ret) if (ret)
goto out; goto out;
/* account is the structural object class */ /* account is the structural object class */
ret = LDAP_addmod(&mods, LDAP_MOD_ADD, "objectClass", if (is_account == FALSE) {
structural_object); ret = LDAP_addmod(&mods, LDAP_MOD_ADD, "objectClass",
is_account = TRUE; structural_object);
if (ret) is_account = TRUE;
goto out; if (ret)
goto out;
}
ret = LDAP_addmod(&mods, LDAP_MOD_ADD, "objectClass", "krb5Principal"); ret = LDAP_addmod(&mods, LDAP_MOD_ADD, "objectClass", "krb5Principal");
is_heimdal_principal = TRUE; is_heimdal_principal = TRUE;
@@ -495,9 +517,8 @@ LDAP_entry2mods(krb5_context context, HDB * db, hdb_entry * ent,
ret = ENOMEM; ret = ENOMEM;
goto out; goto out;
} }
ret = ret = LDAP_addmod(&mods, LDAP_MOD_REPLACE, "krb5KeyVersionNumber",
LDAP_addmod(&mods, LDAP_MOD_REPLACE, "krb5KeyVersionNumber", tmp);
tmp);
free(tmp); free(tmp);
if (ret) if (ret)
goto out; goto out;