diff options
| -rw-r--r-- | docs/docbook/manpages/smb.conf.5.sgml | 33 | ||||
| -rw-r--r-- | docs/docbook/smbdotconf/ldap/ldapdeletedn.xml | 2 | ||||
| -rw-r--r-- | docs/docbook/smbdotconf/ldap/ldapdelonlysamattr.xml | 6 | ||||
| -rw-r--r-- | docs/docbook/smbdotconf/logon/setprimarygroupscript.xml | 17 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 1 |
5 files changed, 39 insertions, 20 deletions
diff --git a/docs/docbook/manpages/smb.conf.5.sgml b/docs/docbook/manpages/smb.conf.5.sgml index ef4f9cd783..90b636fc87 100644 --- a/docs/docbook/manpages/smb.conf.5.sgml +++ b/docs/docbook/manpages/smb.conf.5.sgml @@ -657,7 +657,6 @@ alias|alias|alias|alias... <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 @@ alias|alias|alias|alias... <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> @@ -3440,7 +3440,7 @@ df $1 | tail -1 | awk '{print $2" "$4}' </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. @@ -3452,16 +3452,6 @@ df $1 | tail -1 | awk '{print $2" "$4}' <varlistentry> - <term><anchor id="LDAPDELONLYSAMATTR"/>ldap del only sam attr (G)</term> - <listitem><para> Inverted synonym for <link linkend="LDAPDELETEDN"><parameter> - ldap delete dn</parameter></link>.</para> - </listitem> - </varlistentry> - - - - - <varlistentry> <term><anchor id="LDAPFILTER"/>ldap filter (G)</term> <listitem><para>This parameter specifies the RFC 2254 compliant LDAP search filter. The default is to match the login name with the <constant>uid</constant> @@ -6955,6 +6945,25 @@ print5|My Printer 5 </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/docs/docbook/smbdotconf/ldap/ldapdeletedn.xml b/docs/docbook/smbdotconf/ldap/ldapdeletedn.xml index 2b081853c6..f4a820c16d 100644 --- a/docs/docbook/smbdotconf/ldap/ldapdeletedn.xml +++ b/docs/docbook/smbdotconf/ldap/ldapdeletedn.xml @@ -1,5 +1,5 @@ <samba:parameter xmlns:samba="http://samba.org/common"> - <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. diff --git a/docs/docbook/smbdotconf/ldap/ldapdelonlysamattr.xml b/docs/docbook/smbdotconf/ldap/ldapdelonlysamattr.xml deleted file mode 100644 index bae5b51e60..0000000000 --- a/docs/docbook/smbdotconf/ldap/ldapdelonlysamattr.xml +++ /dev/null @@ -1,6 +0,0 @@ -<samba:parameter xmlns:samba="http://samba.org/common"> - <term><anchor id="LDAPDELONLYSAMATTR"/>ldap del only sam attr (G)</term> - <listitem><para> Inverted synonym for <link linked="LDAPDELETEDN"><parameter moreinfo="none"> - ldap delete dn</parameter></link>.</para> - </listitem> - </samba:parameter> diff --git a/docs/docbook/smbdotconf/logon/setprimarygroupscript.xml b/docs/docbook/smbdotconf/logon/setprimarygroupscript.xml new file mode 100644 index 0000000000..c4b2aa1d92 --- /dev/null +++ b/docs/docbook/smbdotconf/logon/setprimarygroupscript.xml @@ -0,0 +1,17 @@ +<samba:parameter xmlns:samba="http://samba.org/common"><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> + </samba:parameter> diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index d17db16381..9d5d279b31 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -1044,7 +1044,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}, |