svn commit: samba r5234 - branches/SAMBA_3_0/source/utils trunk/source/utils

[gd at samba.org]

Author: gd
Date: 2005-02-04 22:27:14 +0000 (Fri, 04 Feb 2005)
New Revision: 5234

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5234

Log:
Do not use the "Local Unix Group"-default description for all kinds of
group-mappings. 

Guenther

Modified:
   branches/SAMBA_3_0/source/utils/net_groupmap.c
   trunk/source/utils/net_groupmap.c


Changeset:
Modified: branches/SAMBA_3_0/source/utils/net_groupmap.c
===================================================================
--- branches/SAMBA_3_0/source/utils/net_groupmap.c	2005-02-04 17:46:30 UTC (rev 5233)
+++ branches/SAMBA_3_0/source/utils/net_groupmap.c	2005-02-04 22:27:14 UTC (rev 5234)
@@ -277,8 +277,22 @@
 		sid_to_string(string_sid, &sid);
 	}
 
-	if (!ntcomment[0])
-		fstrcpy(ntcomment, "Local Unix group");
+	if (!ntcomment[0]) {
+		switch (sid_type) {
+		case SID_NAME_WKN_GRP:
+			fstrcpy(ntcomment, "Wellknown Unix group");
+			break;
+		case SID_NAME_DOM_GRP:
+			fstrcpy(ntcomment, "Domain Unix group");
+			break;
+		case SID_NAME_ALIAS:
+			fstrcpy(ntcomment, "Local Unix group");
+			break;
+		default:
+			fstrcpy(ntcomment, "Unix group");
+			break;
+		}
+	}
 		
 	if (!ntgroup[0] )
 		fstrcpy( ntgroup, unixgrp );

Modified: trunk/source/utils/net_groupmap.c
===================================================================
--- trunk/source/utils/net_groupmap.c	2005-02-04 17:46:30 UTC (rev 5233)
+++ trunk/source/utils/net_groupmap.c	2005-02-04 22:27:14 UTC (rev 5234)
@@ -277,8 +277,22 @@
 		sid_to_string(string_sid, &sid);
 	}
 
-	if (!ntcomment[0])
-		fstrcpy(ntcomment, "Local Unix group");
+	if (!ntcomment[0]) {
+		switch (sid_type) {
+		case SID_NAME_WKN_GRP:
+			fstrcpy(ntcomment, "Wellknown Unix group");
+			break;
+		case SID_NAME_DOM_GRP:
+			fstrcpy(ntcomment, "Domain Unix group");
+			break;
+		case SID_NAME_ALIAS:
+			fstrcpy(ntcomment, "Local Unix group");
+			break;
+		default:
+			fstrcpy(ntcomment, "Unix group");
+			break;
+		}
+	}
 		
 	if (!ntgroup[0] )
 		fstrcpy( ntgroup, unixgrp );