diff options
author | Luke Leighton <lkcl@samba.org> | 1998-11-29 20:03:33 +0000 |
---|---|---|
committer | Luke Leighton <lkcl@samba.org> | 1998-11-29 20:03:33 +0000 |
commit | 30038de4623bc827ee8019c569faf00583d1fe58 (patch) | |
tree | 1308b8cf5fdf8dcfa27d132015be4a187539a24f /source3/passdb/nispass.c | |
parent | 534e6a2e1b22c1f40d8ba98300baff2c7e473aef (diff) | |
download | samba-30038de4623bc827ee8019c569faf00583d1fe58.tar.gz samba-30038de4623bc827ee8019c569faf00583d1fe58.tar.bz2 samba-30038de4623bc827ee8019c569faf00583d1fe58.zip |
weekend work. user / group database API.
- split sam_passwd and smb_passwd into separate higher-order function tables
- renamed struct smb_passwd's "smb_user" to "unix_user". added "nt_user"
plus user_rid, and added a "wrap" function in both sam_passwd and smb_passwd
password databases to fill in the blank entries that are not obtained
from whatever password database API instance is being used.
NOTE: whenever a struct smb_passwd or struct sam_passwd is used, it MUST
be initialised with pwdb_sam_init() or pwd_smb_init(), see chgpasswd.c
for the only example outside of the password database APIs i could find.
- added query_useraliases code to rpcclient.
- dealt with some nasty interdependencies involving non-smbd programs
and the password database API. this is still not satisfactorily
resolved completelely, but it's the best i can do for now.
- #ifdef'd out some password database options so that people don't
mistakenly set them unless they recompile to _use_ those options.
lots of debugging done, it's still not finished. the unix/NT uid/gid
and user-rid/group-rid issues are better, but not perfect. the "BUILTIN"
domain is still missing: users cannot be added to "BUILTIN" groups yet,
as we only have an "alias" db API and a "group" db API but not "builtin-alias"
db API...
(This used to be commit 5d5d7e4de7d1514ab87b07ede629de8aa00519a1)
Diffstat (limited to 'source3/passdb/nispass.c')
-rw-r--r-- | source3/passdb/nispass.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/passdb/nispass.c b/source3/passdb/nispass.c index 58257d5b2d..f554958ade 100644 --- a/source3/passdb/nispass.c +++ b/source3/passdb/nispass.c @@ -371,7 +371,7 @@ static BOOL add_nisp21pwd_entry(struct sam_passwd *newpwd) pwdb_set_can_change_time (pwdlchg_t, sizeof(pwdlchg_t), newpwd->pass_can_change_time ); pwdb_set_must_change_time(pwdmchg_t, sizeof(pwdmchg_t), newpwd->pass_must_change_time); - slprintf(uid, sizeof(uid), "%u", newpwd->smb_userid); + slprintf(uid, sizeof(uid), "%u", newpwd->unix_uid); slprintf(user_rid, sizeof(user_rid), "0x%x", newpwd->user_rid); slprintf(smb_grpid, sizeof(smb_grpid), "%u", newpwd->smb_grpid); slprintf(group_rid, sizeof(group_rid), "0x%x", newpwd->group_rid); @@ -500,7 +500,7 @@ static BOOL make_sam_from_nisp(struct sam_passwd *pw_buf, nis_result *result) uidval = atoi(ENTRY_VAL(obj, NPF_UID)); pw_buf->smb_name = user_name; - pw_buf->smb_userid = uidval; + pw_buf->unix_uid = uidval; pw_buf->smb_passwd = smbpwd; pw_buf->smb_nt_passwd = smbntpwd; @@ -621,9 +621,9 @@ static struct smb_passwd *getnisppwnam(char *name) return pwdb_sam_to_smb(getnisp21pwnam(name)); } -static struct sam_passwd *getnisp21pwuid(uid_t smb_userid) +static struct sam_passwd *getnisp21pwuid(uid_t unix_uid) { - return getnisp21pwrid(pwdb_uid_to_user_rid(smb_userid)); + return getnisp21pwrid(pwdb_uid_to_user_rid(unix_uid)); } static struct smb_passwd *getnisppwrid(uid_t user_rid) @@ -631,9 +631,9 @@ static struct smb_passwd *getnisppwrid(uid_t user_rid) return pwdb_sam_to_smb(getnisp21pwuid(pwdb_user_rid_to_uid(user_rid))); } -static struct smb_passwd *getnisppwuid(uid_t smb_userid) +static struct smb_passwd *getnisppwuid(uid_t unix_uid) { - return pwdb_sam_to_smb(getnisp21pwuid(smb_userid)); + return pwdb_sam_to_smb(getnisp21pwuid(unix_uid)); } static struct sam_disp_info *getnispdispnam(char *name) |