diff options
| author | Gerald Carter <jerry@samba.org> | 2002-01-06 23:18:24 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2002-01-06 23:18:24 +0000 |
| commit | c5ea27ae028fe0929f99e0957e40f9f1c5eb7d08 (patch) | |
| tree | 6c82565eca11713742bca96cb14800d4266e22a1 | |
| parent | 81601e8a61335c691cc714c58a6b5beeaf58a5ff (diff) | |
| download | samba-c5ea27ae028fe0929f99e0957e40f9f1c5eb7d08.tar.gz samba-c5ea27ae028fe0929f99e0957e40f9f1c5eb7d08.tar.xz samba-c5ea27ae028fe0929f99e0957e40f9f1c5eb7d08.zip | |
* sync'd up function name with HEAD (pdb_set_logon_div()).
* sync'd up a few lines id pdb_ldap.c with HEAD.
| -rw-r--r-- | source/passdb/passdb.c | 2 | ||||
| -rw-r--r-- | source/passdb/pdb_ldap.c | 8 | ||||
| -rw-r--r-- | source/passdb/pdb_nisplus.c | 2 | ||||
| -rw-r--r-- | source/passdb/pdb_tdb.c | 2 |
4 files changed, 8 insertions, 6 deletions
diff --git a/source/passdb/passdb.c b/source/passdb/passdb.c index a133f14b55b..f5458c74ab3 100644 --- a/source/passdb/passdb.c +++ b/source/passdb/passdb.c @@ -1324,7 +1324,7 @@ BOOL pdb_set_hours_len (SAM_ACCOUNT *sampass, uint32 len) return True; } -BOOL pdb_set_logons_divs (SAM_ACCOUNT *sampass, uint16 hours) +BOOL pdb_set_logon_divs (SAM_ACCOUNT *sampass, uint16 hours) { if (!sampass) return False; diff --git a/source/passdb/pdb_ldap.c b/source/passdb/pdb_ldap.c index d937322332c..86af437bcd5 100644 --- a/source/passdb/pdb_ldap.c +++ b/source/passdb/pdb_ldap.c @@ -536,7 +536,7 @@ static BOOL init_sam_from_ldap (SAM_ACCOUNT * sampass, pdb_set_pass_last_set_time(sampass, pass_last_set_time); pdb_set_hours_len(sampass, hours_len); - pdb_set_logons_divs(sampass, logon_divs); + pdb_set_logon_divs(sampass, logon_divs); pdb_set_uid(sampass, sys_user->pw_uid); pdb_set_gid(sampass, sys_user->pw_gid); @@ -634,12 +634,14 @@ static BOOL init_ldap_from_sam (LDAPMod *** mods, int ldap_state, SAM_ACCOUNT * if ( !pdb_get_user_rid(sampass)) - sampass->user_rid = pdb_uid_to_user_rid(pdb_get_uid(sampass)); + slprintf(temp, sizeof(temp) - 1, "%i", pdb_uid_to_user_rid(pdb_get_uid(sampass))); + else slprintf(temp, sizeof(temp) - 1, "%i", pdb_get_user_rid(sampass)); make_a_mod(mods, ldap_state, "rid", temp); if ( !pdb_get_group_rid(sampass)) - sampass->group_rid = pdb_gid_to_group_rid(pdb_get_gid(sampass)); + slprintf(temp, sizeof(temp) - 1, "%i", pdb_gid_to_group_rid(pdb_get_gid(sampass))); + else slprintf(temp, sizeof(temp) - 1, "%i", pdb_get_group_rid(sampass)); make_a_mod(mods, ldap_state, "primaryGroupID", temp); diff --git a/source/passdb/pdb_nisplus.c b/source/passdb/pdb_nisplus.c index d74788b5d6b..3648fb0341a 100644 --- a/source/passdb/pdb_nisplus.c +++ b/source/passdb/pdb_nisplus.c @@ -398,7 +398,7 @@ static BOOL make_sam_from_nisp_object(SAM_ACCOUNT *pw_buf, nis_object *obj) } pdb_set_unknown_3(pw_buf, 0xffffff); /* don't know */ - pdb_set_logons_divs(pw_buf, 168); /* hours per week */ + pdb_set_logon_divs(pw_buf, 168); /* hours per week */ if( (hours_len = ENTRY_LEN(obj, NPF_HOURS)) == 21 ) { memcpy(hours, ENTRY_VAL(obj, NPF_HOURS), hours_len); diff --git a/source/passdb/pdb_tdb.c b/source/passdb/pdb_tdb.c index 2def016c066..e1b982a009a 100644 --- a/source/passdb/pdb_tdb.c +++ b/source/passdb/pdb_tdb.c @@ -161,7 +161,7 @@ static BOOL init_sam_from_buffer (SAM_ACCOUNT *sampass, uint8 *buf, uint32 bufle pdb_set_unknown_5(sampass, unknown_5); pdb_set_unknown_6(sampass, unknown_6); pdb_set_acct_ctrl(sampass, acct_ctrl); - pdb_set_logons_divs(sampass, logon_divs); + pdb_set_logon_divs(sampass, logon_divs); pdb_set_hours(sampass, hours); done: |