This is a nice rewrite:

SAM_ACCOUNT does not have anymore uid and gid fields
all the code that used them has been fixed to use the proper idmap calls

fix to idmap_tdb for first time idmap.tdb initialization.

auth_serversupplied_info structure has now an uid and gid field

few other fixes to make the system behave correctly with idmap

tested only with tdbsam, but smbpasswd and nisplus should be ok

have not tested ldap !
(This used to be commit 6a6f6032467e55aa9b76390e035623976477ba42)

1 files changed, 15 insertions, 33 deletions

diff --git a/source3/utils/pdbedit.c b/source3/utils/pdbedit.c
index 3a3d06a645..170d2a03f1 100644
--- a/source3/utils/pdbedit.c
+++ b/source3/utils/pdbedit.c
@@ -122,12 +122,6 @@ static int print_sam_info (SAM_ACCOUNT *sam_pwent, BOOL verbosity, BOOL smbpwdst
 		printf ("Unix username:        %s\n", pdb_get_username(sam_pwent));
 		printf ("NT username:          %s\n", pdb_get_nt_username(sam_pwent));
 		printf ("Account Flags:        %s\n", pdb_encode_acct_ctrl(pdb_get_acct_ctrl(sam_pwent), NEW_PW_FORMAT_SPACE_PADDED_LEN));
-		
-		if (IS_SAM_UNIX_USER(sam_pwent)) {
-			uid = pdb_get_uid(sam_pwent);
-			gid = pdb_get_gid(sam_pwent);
-			printf ("User ID/Group ID:     %d/%d\n", uid, gid);
-		}
 		printf ("User SID:             %s\n",
 			sid_string_static(pdb_get_user_sid(sam_pwent)));
 		printf ("Primary Group SID:    %s\n",
@@ -161,35 +155,23 @@ static int print_sam_info (SAM_ACCOUNT *sam_pwent, BOOL verbosity, BOOL smbpwdst
 		printf ("Password must change: %s\n", tmp ? http_timestring(tmp) : "0");
 		
 	} else if (smbpwdstyle) {
-		if (IS_SAM_UNIX_USER(sam_pwent)) {
-			char lm_passwd[33];
-			char nt_passwd[33];
-
-			uid = pdb_get_uid(sam_pwent);
-			pdb_sethexpwd(lm_passwd, 
-				      pdb_get_lanman_passwd(sam_pwent), 
-				      pdb_get_acct_ctrl(sam_pwent));
-			pdb_sethexpwd(nt_passwd, 
-				      pdb_get_nt_passwd(sam_pwent), 
-				      pdb_get_acct_ctrl(sam_pwent));
+		char lm_passwd[33];
+		char nt_passwd[33];
+
+		sid_to_uid(pdb_get_user_sid(sam_pwent), &uid);
+		pdb_sethexpwd(lm_passwd, pdb_get_lanman_passwd(sam_pwent), pdb_get_acct_ctrl(sam_pwent));
+		pdb_sethexpwd(nt_passwd, pdb_get_nt_passwd(sam_pwent), pdb_get_acct_ctrl(sam_pwent));
 			
-			printf("%s:%d:%s:%s:%s:LCT-%08X:\n",
-			       pdb_get_username(sam_pwent),
-			       uid,
-			       lm_passwd,
-			       nt_passwd,
-			       pdb_encode_acct_ctrl(pdb_get_acct_ctrl(sam_pwent),NEW_PW_FORMAT_SPACE_PADDED_LEN),
-			       (uint32)pdb_get_pass_last_set_time(sam_pwent));
-		} else {
-			fprintf(stderr, "Can't output in smbpasswd format, no uid on this record.\n");
-		}
+		printf("%s:%d:%s:%s:%s:LCT-%08X:\n",
+		       pdb_get_username(sam_pwent),
+		       uid,
+		       lm_passwd,
+		       nt_passwd,
+		       pdb_encode_acct_ctrl(pdb_get_acct_ctrl(sam_pwent),NEW_PW_FORMAT_SPACE_PADDED_LEN),
+		       (uint32)pdb_get_pass_last_set_time(sam_pwent));
 	} else {
-		if (IS_SAM_UNIX_USER(sam_pwent)) {
-			printf ("%s:%d:%s\n", pdb_get_username(sam_pwent), pdb_get_uid(sam_pwent), 
-				pdb_get_fullname(sam_pwent));
-		} else {	
-			printf ("%s:(null):%s\n", pdb_get_username(sam_pwent), pdb_get_fullname(sam_pwent));
-		}
+		sid_to_uid(pdb_get_user_sid(sam_pwent), &uid);
+		printf ("%s:%d:%s\n", pdb_get_username(sam_pwent), uid,	pdb_get_fullname(sam_pwent));
 	}
 
 	return 0;