svn commit: samba r22729 - in branches: SAMBA_3_0/source/utils SAMBA_3_0_26/source/utils

[jerry at samba.org]

Author: jerry
Date: 2007-05-06 22:18:44 +0000 (Sun, 06 May 2007)
New Revision: 22729

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

Log:
add help text for osver and osname options to 'net ads join' (patch from Dnailo A.)
Modified:
   branches/SAMBA_3_0/source/utils/net_ads.c
   branches/SAMBA_3_0_26/source/utils/net_ads.c


Changeset:
Modified: branches/SAMBA_3_0/source/utils/net_ads.c
===================================================================
--- branches/SAMBA_3_0/source/utils/net_ads.c	2007-05-06 21:45:53 UTC (rev 22728)
+++ branches/SAMBA_3_0/source/utils/net_ads.c	2007-05-06 22:18:44 UTC (rev 22729)
@@ -1450,7 +1450,12 @@
 	d_printf("                      The OU string read from top to bottom without RDNs and delimited by a '/'.\n");
 	d_printf("                      E.g. \"createcomputer=Computers/Servers/Unix\"\n");
 	d_printf("                      NB: A backslash '\\' is used as escape at multiple levels and may\n");
-	d_printf("                          need to be doubled or even quadrupled.  It is not used as a separator");
+	d_printf("                          need to be doubled or even quadrupled.  It is not used as a separator.\n");
+	d_printf("   osName=string      Set the operatingSystem attribute during the join.\n");
+	d_printf("   osVer=string       Set the operatingSystemVersion attribute during the join.\n");
+	d_printf("                      NB: osName and osVer must be specified together for either to take effect.\n");
+	d_printf("                          Also, the operatingSystemService attribute is also set when along with\n");
+	d_printf("                          the two other attributes.\n");
 
 	return -1;
 }

Modified: branches/SAMBA_3_0_26/source/utils/net_ads.c
===================================================================
--- branches/SAMBA_3_0_26/source/utils/net_ads.c	2007-05-06 21:45:53 UTC (rev 22728)
+++ branches/SAMBA_3_0_26/source/utils/net_ads.c	2007-05-06 22:18:44 UTC (rev 22729)
@@ -1450,7 +1450,12 @@
 	d_printf("                      The OU string read from top to bottom without RDNs and delimited by a '/'.\n");
 	d_printf("                      E.g. \"createcomputer=Computers/Servers/Unix\"\n");
 	d_printf("                      NB: A backslash '\\' is used as escape at multiple levels and may\n");
-	d_printf("                          need to be doubled or even quadrupled.  It is not used as a separator");
+	d_printf("                          need to be doubled or even quadrupled.  It is not used as a separator.\n");
+	d_printf("   osName=string      Set the operatingSystem attribute during the join.\n");
+	d_printf("   osVer=string       Set the operatingSystemVersion attribute during the join.\n");
+	d_printf("                      NB: osName and osVer must be specified together for either to take effect.\n");
+	d_printf("                          Also, the operatingSystemService attribute is also set when along with\n");
+	d_printf("                          the two other attributes.\n");
 
 	return -1;
 }