chgpasswd.c: Changed back to getsmb... from getsam...

ldap.c: Stoped dummy_function being prototyped.
loadparm.c: Fixed slprintf sizes.
nisppass.c: Fixed safe_strcpy sizes.
nmbd_processlogon.c: Changed back to getsmb... from getsam...
nttrans.c: Just a dump of new code.
passdb.c: Moved stuff around a lot - stopped any lookups by rid. This
          needs to be indirected through a function table (soon).
password.c: Changed back to getsmb... from getsam...
reply.c: Changed back to getsmb... from getsam...
slprintf.c: Fixed prototype problems.
smb.h: Fixed prototype problems.
smbpass.c: Changed to getsmbfile....
smbpasswd.c: Changed back to getsmb... from getsam...
lib/rpc/server/srv_netlog.c: Changed back to getsmb... from getsam...
lib/rpc/server/srv_samr.c: Fixed rid lookup - use uid or gid lookup.
lib/rpc/server/srv_util.c: Changed back to getsmb... from getsam...
Jeremy.
(This used to be commit 7d332b2493d2089d09521250fc9b72d8953307c0)

3 files changed, 42 insertions, 18 deletions

diff --git a/source3/rpc_server/srv_netlog.c b/source3/rpc_server/srv_netlog.c
index e5ae3959b9..c81a8244d9 100644
--- a/source3/rpc_server/srv_netlog.c
+++ b/source3/rpc_server/srv_netlog.c
@@ -239,7 +239,7 @@ static BOOL get_md4pw(char *md4pw, char *mach_name, char *mach_acct)
 	}
 
 	become_root(True);
-	smb_pass = getsampwnam(mach_acct);
+	smb_pass = getsmbpwnam(mach_acct);
 	unbecome_root(True);
 
 	if (smb_pass != NULL)
@@ -391,7 +391,7 @@ static void api_net_srv_pwset( int uid,
 		DEBUG(3,("Server Password Set Wksta:[%s]\n", mach_acct));
 
 		become_root(True);
-		smb_pass = getsampwnam(mach_acct);
+		smb_pass = getsmbpwnam(mach_acct);
 		unbecome_root(True);
 
 		if (smb_pass != NULL)
@@ -414,7 +414,7 @@ static void api_net_srv_pwset( int uid,
 			smb_pass->acct_ctrl     = ACB_WSTRUST;
 
 			become_root(True);
-			ret = mod_sampwd_entry(smb_pass,False);
+			ret = mod_smbpwd_entry(smb_pass,False);
 			unbecome_root(True);
 
 			if (ret)
@@ -632,7 +632,7 @@ static void api_net_sam_logon( int uid,
     DEBUG(3,("User:[%s]\n", samlogon_user));
 
     become_root(True);
-    smb_pass = getsampwnam(samlogon_user);
+    smb_pass = getsmbpwnam(samlogon_user);
     unbecome_root(True);
 
     if (smb_pass == NULL)
diff --git a/source3/rpc_server/srv_samr.c b/source3/rpc_server/srv_samr.c
index 821ae75c11..adc16fa5c8 100644
--- a/source3/rpc_server/srv_samr.c
+++ b/source3/rpc_server/srv_samr.c
@@ -53,14 +53,14 @@ static BOOL get_sampwd_entries(SAM_USER_INFO_21 *pw_buf,
 
 	if (pw_buf == NULL) return False;
 
-	vp = startsampwent(False);
+	vp = startsmbpwent(False);
 	if (!vp)
 	{
-		DEBUG(0, ("get_sampwd_entries: Unable to open SMB password file.\n"));
+		DEBUG(0, ("get_sampwd_entries: Unable to open SMB password database.\n"));
 		return False;
 	}
 
-	while (((pwd = getsampwent(vp)) != NULL) && (*num_entries) < max_num_entries)
+	while (((pwd = getsmbpwent(vp)) != NULL) && (*num_entries) < max_num_entries)
 	{
 		int user_name_len = strlen(pwd->smb_name);
 		make_unistr2(&(pw_buf[(*num_entries)].uni_user_name), pwd->smb_name, user_name_len-1);
@@ -77,7 +77,7 @@ static BOOL get_sampwd_entries(SAM_USER_INFO_21 *pw_buf,
 
 		pw_buf[(*num_entries)].acb_info = (uint16)pwd->acct_ctrl;
 
-		DEBUG(5, ("get_sampwd_entries: idx: %d user %s, uid %d, acb %x",
+		DEBUG(5, ("get_smbpwd_entries: idx: %d user %s, uid %d, acb %x",
 		(*num_entries), pwd->smb_name, pwd->smb_userid, pwd->acct_ctrl));
 
 		if (acb_mask == 0 || IS_BITS_SET_SOME(pwd->acct_ctrl, acb_mask))
@@ -93,7 +93,7 @@ static BOOL get_sampwd_entries(SAM_USER_INFO_21 *pw_buf,
 		(*total_entries)++;
 	}
 
-	endsampwent(vp);
+	endsmbpwent(vp);
 
 	return (*num_entries) > 0;
 }
@@ -812,7 +812,7 @@ static void samr_reply_open_user(SAMR_Q_OPEN_USER *q_u,
 	}
 
 	become_root(True);
-	smb_pass = getsampwuid(q_u->user_rid);
+	smb_pass = getsmbpwuid(q_u->user_rid);
 	unbecome_root(True);
 
 	/* check that the RID exists in our domain. */
@@ -864,13 +864,37 @@ static BOOL get_user_info_21(SAM_USER_INFO_21 *id21, uint32 rid)
 {
 	NTTIME dummy_time;
 	struct sam_passwd *sam_pass;
-
 	LOGON_HRS hrs;
 	int i;
 
-	become_root(True);
-	sam_pass = getsam21pwrid(rid);
-	unbecome_root(True);
+    /*
+     * Convert from rid to either a uid or gid as soon as
+     * possible. JRA.
+     */
+
+    if(pdb_rid_is_user(rid))
+    {
+      uint32 uid = pdb_user_rid_to_uid(rid);
+	  become_root(True);
+      sam_pass = getsam21pwuid(uid);
+      unbecome_root(True);
+    }
+    else
+    {
+      struct group *grent;
+      uint32 gid;
+      gid = pdb_group_rid_to_gid(rid);
+      if((grent = getgrgid(gid)) == NULL) 
+      {
+        DEBUG(0,("get_user_info_21: Unable to get group info.\n"));
+        return False;
+      }
+      /* TODO - at this point we need to convert from
+         a UNIX struct group into a user info 21 structure.
+         Punt for now. JRA.
+       */
+      return False;
+    }
 
 	if (sam_pass == NULL)
 	{
@@ -1047,7 +1071,7 @@ static void samr_reply_query_usergroups(SAMR_Q_QUERY_USERGROUPS *q_u,
 	if (status == 0x0)
 	{
 		become_root(True);
-		smb_pass = getsampwuid(rid);
+		smb_pass = getsmbpwuid(rid);
 		unbecome_root(True);
 
 		if (smb_pass == NULL)
@@ -1146,7 +1170,7 @@ static void api_samr_unknown_32( int uid, prs_struct *data, prs_struct *rdata)
 	                            q_u.uni_mach_acct.uni_str_len));
 
 	become_root(True);
-	smb_pass = getsampwnam(mach_acct);
+	smb_pass = getsmbpwnam(mach_acct);
 	unbecome_root(True);
 
 	if (smb_pass != NULL)
diff --git a/source3/rpc_server/srv_util.c b/source3/rpc_server/srv_util.c
index 632c508343..15c06d18bd 100644
--- a/source3/rpc_server/srv_util.c
+++ b/source3/rpc_server/srv_util.c
@@ -419,7 +419,7 @@ uint32 lookup_user_name(uint32 rid, char *user_name, uint32 *type)
 
 	/* ok, it's a user.  find the user account */
 	become_root(True);
-	smb_pass = getsampwuid(rid); /* lkclXXXX SHOULD use rid mapping here! */
+	smb_pass = getsmbpwuid(rid); /* lkclXXXX SHOULD use rid mapping here! */
 	unbecome_root(True);
 
 	if (smb_pass != NULL)
@@ -481,7 +481,7 @@ uint32 lookup_user_rid(char *user_name, uint32 *rid)
 
 	/* find the user account */
 	become_root(True);
-	smb_pass = getsampwnam(user_name);
+	smb_pass = getsmbpwnam(user_name);
 	unbecome_root(True);
 
 	if (smb_pass != NULL)