r4849: * finish SeAddUsers support in srv_samr_nt.c

* define some const SE_PRIV structure for use when
  you need a SE_PRIV* to a privilege
* fix an annoying compiler warngin in smbfilter.c
* translate SIDs to names in 'net rpc rights list accounts'
* fix a seg fault in cli_lsa_enum_account_rights caused by
  me forgetting the precedence of * vs. []
(This used to be commit d25fc84bc2b14da9fcc0f3c8d7baeca83f0ea708)

2 files changed, 47 insertions, 13 deletions

diff --git a/source3/utils/net_rpc_rights.c b/source3/utils/net_rpc_rights.c
index d5652b8247..feb50b457a 100644
--- a/source3/utils/net_rpc_rights.c
+++ b/source3/utils/net_rpc_rights.c
@@ -23,6 +23,37 @@
 /********************************************************************
 ********************************************************************/
 
+static NTSTATUS sid_to_name(struct cli_state *cli, 
+			    TALLOC_CTX *mem_ctx,
+			    DOM_SID *sid, fstring name)
+{
+	POLICY_HND pol;
+	uint32 *sid_types;
+	NTSTATUS result;
+	char **domains, **names;
+
+	result = cli_lsa_open_policy(cli, mem_ctx, True, 
+		SEC_RIGHTS_MAXIMUM_ALLOWED, &pol);
+		
+	if ( !NT_STATUS_IS_OK(result) )
+		return result;
+
+	result = cli_lsa_lookup_sids(cli, mem_ctx, &pol, 1, sid, &domains, &names, &sid_types);
+	
+	if ( NT_STATUS_IS_OK(result) ) {
+		if ( *domains[0] )
+			fstr_sprintf( name, "%s\\%s", domains[0], names[0] );
+		else
+			fstrcpy( name, names[0] );
+	}
+
+	cli_lsa_close(cli, mem_ctx, &pol);
+	return result;
+}
+
+/********************************************************************
+********************************************************************/
+
 static NTSTATUS name_to_sid(struct cli_state *cli, 
 			    TALLOC_CTX *mem_ctx,
 			    DOM_SID *sid, const char *name)
@@ -41,20 +72,14 @@ static NTSTATUS name_to_sid(struct cli_state *cli,
 	result = cli_lsa_open_policy(cli, mem_ctx, True, 
 		SEC_RIGHTS_MAXIMUM_ALLOWED, &pol);
 		
-	if (!NT_STATUS_IS_OK(result))
+	if ( !NT_STATUS_IS_OK(result) )
 		return result;
 
 	result = cli_lsa_lookup_names(cli, mem_ctx, &pol, 1, &name, &sids, &sid_types);
 	
-	if (!NT_STATUS_IS_OK(result)) {
-		d_printf("Failed to convert \"%s\" to a SID [%s]\n",
-			name, nt_errstr(result));
-		goto done;
-	}
+	if ( NT_STATUS_IS_OK(result) )
+		sid_copy( sid, &sids[0] );
 
-	sid_copy( sid, &sids[0] );
-
-done:
 	cli_lsa_close(cli, mem_ctx, &pol);
 	return result;
 }
@@ -143,6 +168,7 @@ static NTSTATUS enum_privileges_for_accounts( TALLOC_CTX *ctx, struct cli_state
 	DOM_SID *sids;
 	uint32 count=0;
 	int i;
+	fstring name;
 
 	result = cli_lsa_enum_sids(cli, ctx, pol, &enum_context, 
 		pref_max_length, &count, &sids);
@@ -151,8 +177,16 @@ static NTSTATUS enum_privileges_for_accounts( TALLOC_CTX *ctx, struct cli_state
 		return result;
 		
 	for ( i=0; i<count; i++ ) {
-
-		d_printf("%s\n", sid_string_static(&sids[i]));
+	
+		/* try to convert the SID to a name.  Fall back to 
+		   printing the raw SID if necessary */
+		   
+		result = sid_to_name( cli, ctx, &sids[i], name );
+		if ( !NT_STATUS_IS_OK (result) )
+			fstrcpy( name, sid_string_static(&sids[i]) );
+			
+		d_printf("%s\n", name);
+		
 		result = enum_privileges_for_user( ctx, cli, pol, &sids[i] );
 		
 		if ( !NT_STATUS_IS_OK(result) )
diff --git a/source3/utils/smbfilter.c b/source3/utils/smbfilter.c
index 5d67c8fc7c..3665647905 100644
--- a/source3/utils/smbfilter.c
+++ b/source3/utils/smbfilter.c
@@ -34,7 +34,7 @@
 static char *netbiosname;
 static char packet[BUFFER_SIZE];
 
-static void save_file(const char *fname, void *packet, size_t length)
+static void save_file(const char *fname, void *ppacket, size_t length)
 {
 	int fd;
 	fd = open(fname, O_WRONLY|O_CREAT|O_TRUNC, 0644);
@@ -42,7 +42,7 @@ static void save_file(const char *fname, void *packet, size_t length)
 		perror(fname);
 		return;
 	}
-	if (write(fd, packet, length) != length) {
+	if (write(fd, ppacket, length) != length) {
 		fprintf(stderr,"Failed to write %s\n", fname);
 		return;
 	}