- group database API. oops and oh dear, the threat has been carried out:

  the pre-alpha "domain group" etc parameters have disappeared.

- interactive debug detection

- re-added mem_man (andrew's memory management, detects memory corruption)

- american spellings of "initialise" replaced with english spelling of
  "initialise".

- started on "lookup_name()" and "lookup_sid()" functions.  proper ones.

- moved lots of functions around.  created some modules of commonly used
  code.  e.g the password file locking code, which is used in groupfile.c
  and aliasfile.c and smbpass.c

- moved RID_TYPE_MASK up another bit.  this is really unfortunate, but
  there is no other "fast" way to identify users from groups from aliases.
  i do not believe that this code saves us anything (the multipliers)
  and puts us at a disadvantage (reduces the useable rid space).
  the designers of NT aren't silly: if they can get away with a user-
  interface-speed LsaLookupNames / LsaLookupSids, then so can we.  i
  spoke with isaac at the cifs conference, the only time for example that
  they do a security context check is on file create.  certainly not on
  individual file reads / writes, which would drastically hit their
  performance and ours, too.

- renamed myworkgroup to global_sam_name, amongst other things, when used
  in the rpc code.  there is also a global_member_name, as we are always
  responsible for a SAM database, the scope of which is limited by the role
  of the machine (e.g if a member of a workgroup, your SAM is for _local_
  logins only, and its name is the name of your server.  you even still
  have a SID.  see LsaQueryInfoPolicy, levels 3 and 5).

- updated functionality of groupname.c to be able to cope with names
  like DOMAIN\group and SERVER\alias.  used this code to be able to
  do aliases as well as groups.  this code may actually be better
  off being used in username mapping, too.

- created a connect to serverlist function in clientgen.c and used it
  in password.c

- initialisation in server.c depends on the role of the server.  well,
  it does now.

- rpctorture.  smbtorture.  EXERCISE EXTREME CAUTION.
(This used to be commit 0d21e1e6090b933f396c764af535ca3388a562db)

1 files changed, 18 insertions, 18 deletions

diff --git a/source3/passdb/ldap.c b/source3/passdb/ldap.c
index ed275c4a88..af48ebbdc0 100644
--- a/source3/passdb/ldap.c
+++ b/source3/passdb/ldap.c
@@ -223,7 +223,7 @@ static void ldap_get_smb_passwd(LDAP *ldap_struct,LDAPMessage *entry,
 	static unsigned char smblmpwd[16];
 	static unsigned char smbntpwd[16];
 
-	pdb_init_smb(user);
+	pwdb_init_smb(user);
 
 	bzero(smblmpwd, sizeof(smblmpwd));
 	bzero(smbntpwd, sizeof(smbntpwd));
@@ -237,16 +237,16 @@ static void ldap_get_smb_passwd(LDAP *ldap_struct,LDAPMessage *entry,
 	bzero(temp, sizeof(temp)); /* destroy local copy of the password */
 #else
 	get_single_attribute(ldap_struct, entry, "unicodePwd", temp);
-	pdb_gethexpwd(temp, smbntpwd);		
+	pwdb_gethexpwd(temp, smbntpwd);		
 	bzero(temp, sizeof(temp)); /* destroy local copy of the password */
 
 	get_single_attribute(ldap_struct, entry, "dBCSPwd", temp);
-	pdb_gethexpwd(temp, smblmpwd);		
+	pwdb_gethexpwd(temp, smblmpwd);		
 	bzero(temp, sizeof(temp)); /* destroy local copy of the password */
 #endif
 	
 	get_single_attribute(ldap_struct, entry, "userAccountControl", temp);
-	user->acct_ctrl = pdb_decode_acct_ctrl(temp);
+	user->acct_ctrl = pwdb_decode_acct_ctrl(temp);
 
 	get_single_attribute(ldap_struct, entry, "pwdLastSet", temp);
 	user->pass_last_set_time = (time_t)strtol(temp, NULL, 16);
@@ -254,7 +254,7 @@ static void ldap_get_smb_passwd(LDAP *ldap_struct,LDAPMessage *entry,
 	get_single_attribute(ldap_struct, entry, "rid", temp);
 
 	/* the smb (unix) ids are not stored: they are created */
-	user->smb_userid = pdb_user_rid_to_uid (atoi(temp));
+	user->smb_userid = pwdb_user_rid_to_uid (atoi(temp));
 
 	if (user->acct_ctrl & (ACB_DOMTRUST|ACB_WSTRUST|ACB_SVRTRUST) )
 	{
@@ -288,7 +288,7 @@ static void ldap_get_sam_passwd(LDAP *ldap_struct, LDAPMessage *entry,
 	static pstring temp;
 	static struct smb_passwd pw_buf;
 
-	pdb_init_sam(user);
+	pwdb_init_sam(user);
 
 	ldap_get_smb_passwd(ldap_struct, entry, &pw_buf);
 	
@@ -576,7 +576,7 @@ static BOOL modadd_ldappwd_entry(struct smb_passwd *newpwd, int flag)
 	
 	make_a_mod(&mods, ldap_state, "rid", rid);
 	make_a_mod(&mods, ldap_state, "pwdLastSet", lst);
-	make_a_mod(&mods, ldap_state, "userAccountControl", pdb_encode_acct_ctrl(newpwd->acct_ctrl, NEW_PW_FORMAT_SPACE_PADDED_LEN));
+	make_a_mod(&mods, ldap_state, "userAccountControl", pwdb_encode_acct_ctrl(newpwd->acct_ctrl, NEW_PW_FORMAT_SPACE_PADDED_LEN));
 	
 	switch(flag)
 	{
@@ -708,7 +708,7 @@ static BOOL modadd_ldap21pwd_entry(struct sam_passwd *newpwd, int flag)
 	
 	make_a_mod(&mods, ldap_state, "rid", rid);
 	make_a_mod(&mods, ldap_state, "pwdLastSet", lst);
-	make_a_mod(&mods, ldap_state, "userAccountControl", pdb_encode_acct_ctrl(newpwd->acct_ctrl,NEW_PW_FORMAT_SPACE_PADDED_LEN));
+	make_a_mod(&mods, ldap_state, "userAccountControl", pwdb_encode_acct_ctrl(newpwd->acct_ctrl,NEW_PW_FORMAT_SPACE_PADDED_LEN));
 	
 	ldap_modify_s(ldap_struct, dn, mods);
 	
@@ -922,52 +922,52 @@ static BOOL setldappwpos(void *vp, SMB_BIG_UINT tok)
 
 static struct smb_passwd *getldappwnam(char *name)
 {
-  return pdb_sam_to_smb(iterate_getsam21pwnam(name));
+  return pwdb_sam_to_smb(iterate_getsam21pwnam(name));
 }
 
 static struct smb_passwd *getldappwuid(uid_t smb_userid)
 {
-  return pdb_sam_to_smb(iterate_getsam21pwuid(smb_userid));
+  return pwdb_sam_to_smb(iterate_getsam21pwuid(smb_userid));
 }
 
 static struct smb_passwd *getldappwrid(uint32 user_rid)
 {
-  return pdb_sam_to_smb(iterate_getsam21pwuid(pdb_user_rid_to_uid(user_rid)));
+  return pwdb_sam_to_smb(iterate_getsam21pwuid(pwdb_user_rid_to_uid(user_rid)));
 }
 
 static struct smb_passwd *getldappwent(void *vp)
 {
-  return pdb_sam_to_smb(getldap21pwent(vp));
+  return pwdb_sam_to_smb(getldap21pwent(vp));
 }
 
 static BOOL add_ldappwd_entry(struct smb_passwd *newpwd)
 {
-  return add_ldap21pwd_entry(pdb_smb_to_sam(newpwd));
+  return add_ldap21pwd_entry(pwdb_smb_to_sam(newpwd));
 }
 
 static BOOL mod_ldappwd_entry(struct smb_passwd* pwd, BOOL override)
 {
-  return mod_ldap21pwd_entry(pdb_smb_to_sam(pwd), override);
+  return mod_ldap21pwd_entry(pwdb_smb_to_sam(pwd), override);
 }
 
 static struct sam_disp_info *getldapdispnam(char *name)
 {
-	return pdb_sam_to_dispinfo(getldap21pwnam(name));
+	return pwdb_sam_to_dispinfo(getldap21pwnam(name));
 }
 
 static struct sam_disp_info *getldapdisprid(uint32 rid)
 {
-	return pdb_sam_to_dispinfo(getldap21pwrid(rid));
+	return pwdb_sam_to_dispinfo(getldap21pwrid(rid));
 }
 
 static struct sam_disp_info *getldapdispent(void *vp)
 {
-	return pdb_sam_to_dispinfo(getldap21pwent(vp));
+	return pwdb_sam_to_dispinfo(getldap21pwent(vp));
 }
 
 static struct sam_passwd *getldap21pwuid(uid_t uid)
 {
-	return pdb_smb_to_sam(iterate_getsam21pwuid(pdb_uid_to_user_rid(uid)));
+	return pwdb_smb_to_sam(iterate_getsam21pwuid(pwdb_uid_to_user_rid(uid)));
 }
 
 static struct passdb_ops ldap_ops =