svn commit: samba r13058 - branches/SAMBA_3_0/source/lib trunk/source/lib

lmuelle at samba.org lmuelle at samba.org
Fri Jan 20 20:22:24 GMT 2006


Author: lmuelle
Date: 2006-01-20 20:22:23 +0000 (Fri, 20 Jan 2006)
New Revision: 13058

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

Log:
Add %w macro for the winbind seperator which allows us for example
        valid users = %S, %D%w%S

Modified:
   branches/SAMBA_3_0/source/lib/substitute.c
   trunk/source/lib/substitute.c


Changeset:
Modified: branches/SAMBA_3_0/source/lib/substitute.c
===================================================================
--- branches/SAMBA_3_0/source/lib/substitute.c	2006-01-20 17:47:56 UTC (rev 13057)
+++ branches/SAMBA_3_0/source/lib/substitute.c	2006-01-20 20:22:23 UTC (rev 13058)
@@ -448,6 +448,9 @@
 		case 'v' :
 			string_sub(p,"%v", SAMBA_VERSION_STRING,l);
 			break;
+		case 'w' :
+			string_sub(p,"%w", lp_winbind_separator(),l);
+			break;
 		case '$' :
 			p += expand_env_var(p,l);
 			break; /* Expand environment variables */
@@ -615,6 +618,9 @@
 		case 'v' :
 			t = realloc_string_sub(t, "%v", SAMBA_VERSION_STRING);
 			break;
+		case 'w' :
+			t = realloc_string_sub(t, "%w", lp_winbind_separator());
+			break;
 		case '$' :
 			t = realloc_expand_env_var(t, p); /* Expand environment variables */
 			break;

Modified: trunk/source/lib/substitute.c
===================================================================
--- trunk/source/lib/substitute.c	2006-01-20 17:47:56 UTC (rev 13057)
+++ trunk/source/lib/substitute.c	2006-01-20 20:22:23 UTC (rev 13058)
@@ -448,6 +448,9 @@
 		case 'v' :
 			string_sub(p,"%v", SAMBA_VERSION_STRING,l);
 			break;
+		case 'w' :
+			string_sub(p,"%w", lp_winbind_separator(),l);
+			break;
 		case '$' :
 			p += expand_env_var(p,l);
 			break; /* Expand environment variables */
@@ -615,6 +618,9 @@
 		case 'v' :
 			t = realloc_string_sub(t, "%v", SAMBA_VERSION_STRING);
 			break;
+		case 'w' :
+			t = realloc_string_sub(t, "%w", lp_winbind_separator());
+			break;
 		case '$' :
 			t = realloc_expand_env_var(t, p); /* Expand environment variables */
 			break;



More information about the samba-cvs mailing list