svn commit: samba-docs r899 - in trunk/manpages-3: .
jelmer at samba.org
jelmer at samba.org
Mon Dec 26 00:06:07 GMT 2005
Author: jelmer
Date: 2005-12-26 00:06:07 +0000 (Mon, 26 Dec 2005)
New Revision: 899
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-docs&rev=899
Log:
Move pam_winbind manpage to correct section
Added:
trunk/manpages-3/pam_winbind.7.xml
Removed:
trunk/manpages-3/pam_winbind.8.xml
Changeset:
Copied: trunk/manpages-3/pam_winbind.7.xml (from rev 897, trunk/manpages-3/pam_winbind.8.xml)
===================================================================
--- trunk/manpages-3/pam_winbind.8.xml 2005-12-23 19:12:11 UTC (rev 897)
+++ trunk/manpages-3/pam_winbind.7.xml 2005-12-26 00:06:07 UTC (rev 899)
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<refentry id="pam_winbind.7">
+
+<refmeta>
+ <refentrytitle>pam_winbind</refentrytitle>
+ <manvolnum>7</manvolnum>
+</refmeta>
+
+
+<refnamediv>
+ <refname>pam_winbind</refname>
+ <refpurpose>PAM module for Winbind</refpurpose>
+</refnamediv>
+
+<refsect1>
+ <title>DESCRIPTION</title>
+
+ <para>This tool is part of the <citerefentry><refentrytitle>samba</refentrytitle>
+ <manvolnum>7</manvolnum></citerefentry> suite.</para>
+
+ <para>pam_winbind is a PAM module that can authenticate users against the local domain
+ by talking to the Winbind daemon.</para>
+
+</refsect1>
+
+<refsect1>
+ <title>OPTIONS</title>
+ <para>
+ pam_winbind supports several options:
+ <variablelist>
+
+ <varlistentry>
+ <term>debug</term>
+ <listitem><para>Gives debugging output to syslog.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>require_membership_of=[SID or NAME]</term>
+ <listitem><para>
+ If this option is set, pam_winbind will only succeed if the
+ user is a member of the given SID or NAME. A SID can be either a group-SID, a
+ alias-SID or even a user-SID. It is also possible to give a NAME instead of the
+ SID. That name must have the form: <parameter>MYDOMAIN\mygroup</parameter> or
+ <parameter>MYDOMAIN\myuser</parameter>. pam_winbind will, in that case, lookup
+ the SID internally. Note that NAME may not contain any spaces. It is thus
+ recommended to only use SIDs. You can verify the list of SIDs a user is a member
+ of with <command>wbinfo --user-sids=SID</command>.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>try_first_pass</term>
+ <listitem><para></para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>use_first_pass</term>
+ <listitem><para>
+ By default, pam_winbind tries to get the
+ authentication token from a previous module. If no token is available it asks the user
+ for the old password. With this option, pam_winbind aborts with an
+ error if no authentication token from a previous module is available.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>use_authtok</term>
+ <listitem><para>
+ Set the new password to the one provided by the previously
+ stacked password module. If this option is not set pam_winbind will ask the
+ user for the new password.
+ </para></listitem>
+ </varlistentry>
+
+ </variablelist>
+
+
+ </para>
+
+</refsect1>
+
+<refsect1>
+ <title>SEE ALSO</title>
+ <para><citerefentry>
+ <refentrytitle>wbinfo</refentrytitle>
+ <manvolnum>1</manvolnum></citerefentry>, <citerefentry>
+ <refentrytitle>winbindd</refentrytitle>
+ <manvolnum>8</manvolnum></citerefentry></para>
+</refsect1>
+
+<refsect1>
+ <title>VERSION</title>
+
+ <para>This man page is correct for version 3.0 of Samba.</para>
+</refsect1>
+
+<refsect1>
+ <title>AUTHOR</title>
+
+ <para>The original Samba software and related utilities
+ were created by Andrew Tridgell. Samba is now developed
+ by the Samba Team as an Open Source project similar
+ to the way the Linux kernel is developed.</para>
+
+ <para>This manpage was written by Jelmer Vernooij and Guenther Deschner.</para>
+
+</refsect1>
+
+</refentry>
Deleted: trunk/manpages-3/pam_winbind.8.xml
===================================================================
--- trunk/manpages-3/pam_winbind.8.xml 2005-12-25 23:45:57 UTC (rev 898)
+++ trunk/manpages-3/pam_winbind.8.xml 2005-12-26 00:06:07 UTC (rev 899)
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
-<refentry id="pam_winbind.8">
-
-<refmeta>
- <refentrytitle>pam_winbind</refentrytitle>
- <manvolnum>8</manvolnum>
-</refmeta>
-
-
-<refnamediv>
- <refname>pam_winbind</refname>
- <refpurpose>PAM module for Winbind</refpurpose>
-</refnamediv>
-
-<refsect1>
- <title>DESCRIPTION</title>
-
- <para>This tool is part of the <citerefentry><refentrytitle>samba</refentrytitle>
- <manvolnum>7</manvolnum></citerefentry> suite.</para>
-
- <para>pam_winbind is a PAM module that can authenticate users against the local domain
- by talking to the Winbind daemon.</para>
-
-</refsect1>
-
-<refsect1>
- <title>OPTIONS</title>
- <para>
- pam_winbind supports several options:
- <variablelist>
-
- <varlistentry>
- <term>debug</term>
- <listitem><para>Gives debugging output to syslog.</para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>require_membership_of=[SID or NAME]</term>
- <listitem><para>
- If this option is set, pam_winbind will only succeed if the
- user is a member of the given SID or NAME. A SID can be either a group-SID, a
- alias-SID or even a user-SID. It is also possible to give a NAME instead of the
- SID. That name must have the form: <parameter>MYDOMAIN\mygroup</parameter> or
- <parameter>MYDOMAIN\myuser</parameter>. pam_winbind will, in that case, lookup
- the SID internally. Note that NAME may not contain any spaces. It is thus
- recommended to only use SIDs. You can verify the list of SIDs a user is a member
- of with <command>wbinfo --user-sids=SID</command>.
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>try_first_pass</term>
- <listitem><para></para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>use_first_pass</term>
- <listitem><para>
- By default, pam_winbind tries to get the
- authentication token from a previous module. If no token is available it asks the user
- for the old password. With this option, pam_winbind aborts with an
- error if no authentication token from a previous module is available.
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>use_authtok</term>
- <listitem><para>
- Set the new password to the one provided by the previously
- stacked password module. If this option is not set pam_winbind will ask the
- user for the new password.
- </para></listitem>
- </varlistentry>
-
- </variablelist>
-
-
- </para>
-
-</refsect1>
-
-<refsect1>
- <title>SEE ALSO</title>
- <para><citerefentry>
- <refentrytitle>wbinfo</refentrytitle>
- <manvolnum>1</manvolnum></citerefentry>, <citerefentry>
- <refentrytitle>winbindd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry></para>
-</refsect1>
-
-<refsect1>
- <title>VERSION</title>
-
- <para>This man page is correct for version 3.0 of Samba.</para>
-</refsect1>
-
-<refsect1>
- <title>AUTHOR</title>
-
- <para>The original Samba software and related utilities
- were created by Andrew Tridgell. Samba is now developed
- by the Samba Team as an Open Source project similar
- to the way the Linux kernel is developed.</para>
-
- <para>This manpage was written by Jelmer Vernooij and Guenther Deschner.</para>
-
-</refsect1>
-
-</refentry>
More information about the samba-cvs
mailing list