From 0be502a9c09ff319c87394bb36665be9731c23bb Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Mon, 31 Mar 2003 11:06:17 +0000
Subject: [PATCH] 3 things:

* Remove 'ldap del only sam attr' after asking Lars Mueller from SuSE first.
  It is replaced by 'ldap delete dn'

* Fix a typo in docs.

* Document 'set primary group script'.

Volker
---
 docs/docbook/manpages/smb.conf.5.sgml | 23 +++++++++++++++++++++--
 source/param/loadparm.c               |  1 -
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/docs/docbook/manpages/smb.conf.5.sgml b/docs/docbook/manpages/smb.conf.5.sgml
index 70b3cd57f56..7910b1ce8ef 100644
--- a/docs/docbook/manpages/smb.conf.5.sgml
+++ b/docs/docbook/manpages/smb.conf.5.sgml
@@ -658,7 +658,6 @@
 		
 		<listitem><para><link linkend="LDAPADMINDN"><parameter>ldap admin dn</parameter></link></para></listitem>
 		<listitem><para><link linkend="LDAPDELETEDN"><parameter>ldap delete dn</parameter></link></para></listitem>
-		<listitem><para><link linkend="LDAPDELONLYSAMATTR"><parameter>ldap del only sam attr</parameter></link></para></listitem>
 		<listitem><para><link linkend="LDAPFILTER"><parameter>ldap filter</parameter></link></para></listitem>
                 <listitem><para><link linkend="LDAPPORT"><parameter>ldap port</parameter></link></para></listitem>
                 <listitem><para><link linkend="LDAPSERVER"><parameter>ldap server</parameter></link></para></listitem>
@@ -746,6 +745,7 @@
 		<listitem><para><link linkend="ROOTDIRECTORY"><parameter>root directory</parameter></link></para></listitem>
 		<listitem><para><link linkend="SECURITY"><parameter>security</parameter></link></para></listitem>
 		<listitem><para><link linkend="SERVERSTRING"><parameter>server string</parameter></link></para></listitem>
+		<listitem><para><link linkend="SETPRIMARYGROUPSCRIPT"><parameter>set primary group script</parameter></link></para></listitem>
 		<listitem><para><link linkend="SHOWADDPRINTERWIZARD"><parameter>show add printer wizard</parameter></link></para></listitem>
 		<listitem><para><link linkend="SHUTDOWNSCRIPT"><parameter>shutdown script</parameter></link></para></listitem>
 		<listitem><para><link linkend="SMBPASSWDFILE"><parameter>smb passwd file</parameter></link></para></listitem>
@@ -3437,7 +3437,7 @@
 		</varlistentry>
 	
 		<varlistentry>
-		<term><anchor id="LDAPDELETEDN"/>ldap del only sam attr (G)</term>
+		<term><anchor id="LDAPDELETEDN"/>ldap delete dn (G)</term>
 		<listitem><para> This parameter specifies whether a delete
 		operation in the ldapsam deletes the complete entry or only the attributes
 		specific to Samba.
@@ -7031,6 +7031,25 @@
 		</listitem>
 		</varlistentry>
 
+		<varlistentry>
+		<term><anchor id="SETPRIMARYGROUPSCRIPT"/>set primary group script (G)</term>
+		<listitem><para>Thanks to the Posix subsystem in NT a
+		Windows User has a primary group in addition to the
+		auxiliary groups.  This script sets the primary group
+		in the unix userdatase when an administrator sets the
+		primary group from the windows user manager or when
+		fetching a SAM with <command>net rpc
+		vampire</command>. <parameter>%u</parameter> will be
+		replaced with the user whose primary group is to be
+		set.  <parameter>%g</parameter> will be replaced with
+		the group to set.
+
+		<para>Default: <emphasis>No default value</emphasis></para>
+
+		<para>Example: <command>set primary group script = /usr/sbin/usermod -g '%g' '%u'</command></para>
+		</listitem>
+		</varlistentry>
+
 
 
 		<varlistentry>
diff --git a/source/param/loadparm.c b/source/param/loadparm.c
index e9ee19bc942..606c4d605a6 100644
--- a/source/param/loadparm.c
+++ b/source/param/loadparm.c
@@ -1027,7 +1027,6 @@ static struct parm_struct parm_table[] = {
 	{"ldap passwd sync", P_ENUM, P_GLOBAL, &Globals.ldap_passwd_sync, NULL, enum_ldap_passwd_sync, FLAG_ADVANCED | FLAG_DEVELOPER},
 	{"ldap trust ids", P_BOOL, P_GLOBAL, &Globals.ldap_trust_ids, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
 	{"ldap delete dn", P_BOOL, P_GLOBAL, &Globals.ldap_delete_dn, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-	{"ldap del only sam attr", P_BOOLREV, P_GLOBAL, &Globals.ldap_delete_dn, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
 
 	{"Miscellaneous Options", P_SEP, P_SEPARATOR},
 	{"add share command", P_STRING, P_GLOBAL, &Globals.szAddShareCommand, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-- 
2.11.4.GIT