[SCM] Samba Shared Repository - branch v3-0-test updated -
release-3-0-29-55-g48ce0e6
John Terpstra
jht at samba.org
Thu Jun 19 21:23:36 GMT 2008
The branch, v3-0-test has been updated
via 48ce0e68353c42296ed6a3b59fa3430f80bde236 (commit)
via 2ecba5312bbbeb28f939bddb04a2bd84771a8ecc (commit)
via 407d9916a791d8b734b6aa61ec60bf56496b4389 (commit)
via 7571bb2760f16eae88b87a7a4465391c210983cb (commit)
via 0828099dd7cc3145d2b13fd74c4943ed98bf9750 (commit)
via 72cb76f5682370f99f30a3393be19df764ee1e35 (commit)
via 1af605bd21383be3c14a60f4c15b77281f4c88a7 (commit)
via 4f876631b65ab915466526e7f5b97cff2ec92dae (commit)
via e4848b36cae506fc6d7f7fa189d226fe551db2f4 (commit)
via fa943ff02a45fc68a97087878a4167e42a008ae9 (commit)
via ad7ad45eb8cd40baeafacf5fdec13dbd1e0304d3 (commit)
via a14ae0c29d3777bebe98ced4c4871cc4d9afc699 (commit)
via b123fb7948ea37ee7b9346b2a21e76af089ff37e (commit)
via b770a81ac20768aa7be77ea79e44b10120148334 (commit)
via 8f5ddd212c6cd094f2941aa590b6d4e915bf904c (commit)
from 4e755cb5f56ee15c5151efc0dfed280c91819a39 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test
- Log -----------------------------------------------------------------
commit 48ce0e68353c42296ed6a3b59fa3430f80bde236
Author: John H Terpstra <jht at samba.org>
Date: Thu Jun 19 16:11:10 2008 -0500
Fixing net help info.
commit 2ecba5312bbbeb28f939bddb04a2bd84771a8ecc
Merge: 407d9916a791d8b734b6aa61ec60bf56496b4389 4e755cb5f56ee15c5151efc0dfed280c91819a39
Author: John H Terpstra <jht at samba.org>
Date: Thu Jun 19 11:11:59 2008 -0500
Merge branch 'v3-0-test' of git://git.samba.org/samba into v3-0-test
commit 407d9916a791d8b734b6aa61ec60bf56496b4389
Merge: 7571bb2760f16eae88b87a7a4465391c210983cb 1ad5cd93e69d8b82a71690d16df7e5cb2078bb65
Author: John H Terpstra <jht at samba.org>
Date: Fri Jun 13 15:51:05 2008 -0500
Merge branch 'v3-0-test' of git://git.samba.org/samba into v3-0-test
commit 7571bb2760f16eae88b87a7a4465391c210983cb
Merge: 0828099dd7cc3145d2b13fd74c4943ed98bf9750 5ec31972e05b0479c615bf64f8fa147ab501345b
Author: John H Terpstra <jht at samba.org>
Date: Wed Jun 11 10:36:27 2008 -0500
Merge branch 'v3-0-test' of git://git.samba.org/samba into v3-0-test
commit 0828099dd7cc3145d2b13fd74c4943ed98bf9750
Merge: 72cb76f5682370f99f30a3393be19df764ee1e35 80c39eefffe0ad43d3498ae2eae3aaeb9c259c79
Author: John H Terpstra <jht at samba.org>
Date: Tue Jun 10 13:31:57 2008 -0500
Merge branch 'v3-0-test' of git://git.samba.org/samba into v3-0-test
commit 72cb76f5682370f99f30a3393be19df764ee1e35
Merge: 1af605bd21383be3c14a60f4c15b77281f4c88a7 c2e96cf6c32a646cdcf803144f115680690e15a8
Author: John H Terpstra <jht at samba.org>
Date: Mon Jun 9 22:46:49 2008 -0500
Merge branch 'v3-0-test' of git://git.samba.org/samba into v3-0-test
commit 1af605bd21383be3c14a60f4c15b77281f4c88a7
Merge: 4f876631b65ab915466526e7f5b97cff2ec92dae 36729f6f1680310d51f126aa4b7760f11e405a9c
Author: John H Terpstra <jht at samba.org>
Date: Fri Jun 6 14:13:38 2008 -0500
Merge branch 'v3-0-test' of git://git.samba.org/samba into v3-0-test
commit 4f876631b65ab915466526e7f5b97cff2ec92dae
Merge: e4848b36cae506fc6d7f7fa189d226fe551db2f4 7fdb5eb6d7dd42fa036edf216d66fea582b6a3f4
Author: John H Terpstra <jht at samba.org>
Date: Thu Jun 5 10:54:32 2008 -0500
Merge branch 'v3-0-test' of git://git.samba.org/samba into v3-0-test
commit e4848b36cae506fc6d7f7fa189d226fe551db2f4
Merge: fa943ff02a45fc68a97087878a4167e42a008ae9 2cbe492aac2103bacd6554a0759d76153cf27235
Author: John H Terpstra <jht at samba.org>
Date: Sat May 31 10:14:41 2008 -0500
Merge branch 'v3-0-test' of git://git.samba.org/samba into v3-0-test
commit fa943ff02a45fc68a97087878a4167e42a008ae9
Merge: ad7ad45eb8cd40baeafacf5fdec13dbd1e0304d3 0e407e77ad5af4bb78b1e6da247398f2677618ee
Author: John H Terpstra <jht at samba.org>
Date: Thu May 29 15:45:58 2008 -0500
Merge branch 'v3-0-test' of git://git.samba.org/samba into v3-0-test
commit ad7ad45eb8cd40baeafacf5fdec13dbd1e0304d3
Merge: a14ae0c29d3777bebe98ced4c4871cc4d9afc699 a7ad5189670d6497c958edc1a85e41ecb50df837
Author: John H Terpstra <jht at samba.org>
Date: Fri May 23 08:30:23 2008 -0500
Merge branch 'v3-0-test' of git://git.samba.org/samba into v3-0-test
commit a14ae0c29d3777bebe98ced4c4871cc4d9afc699
Merge: b123fb7948ea37ee7b9346b2a21e76af089ff37e 5c83e5f9d5f672817e64c7c8c0865d3a3e2eaf14
Author: John H Terpstra <jht at samba.org>
Date: Wed May 21 15:39:14 2008 -0500
Merge branch 'v3-0-test' of git://git.samba.org/samba into v3-0-test
commit b123fb7948ea37ee7b9346b2a21e76af089ff37e
Author: John H Terpstra <jht at samba.org>
Date: Wed May 21 08:52:18 2008 -0500
Fix typos.
commit b770a81ac20768aa7be77ea79e44b10120148334
Merge: 8f5ddd212c6cd094f2941aa590b6d4e915bf904c a39d9ab9c68932c15f5b42d8539aab6dfbc4d57a
Author: John H Terpstra <jht at samba.org>
Date: Wed May 21 08:44:01 2008 -0500
Merge branch 'v3-0-test' of git://git.samba.org/samba into v3-0-test
commit 8f5ddd212c6cd094f2941aa590b6d4e915bf904c
Author: John H Terpstra <jht at samba.org>
Date: Mon May 19 12:58:00 2008 -0500
Clarification that hosts resolution is done by winbind only on IRIX, all other systems use libnss_wins.so.
-----------------------------------------------------------------------
Summary of changes:
WHATSNEW.txt | 4 ++--
docs-xml/manpages-3/winbindd.8.xml | 25 ++++++++++++++-----------
source/utils/net_help.c | 9 +++++----
3 files changed, 21 insertions(+), 17 deletions(-)
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 0af6a15..919039d 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -91,7 +91,7 @@ o Gerald (Jerry) Carter <jerry at samba.org>
o Glenn Curtis <gcurtis at likewisesoftware.com>
- * Prevent cycle in Wibind's list of children when reaping dead processes.
+ * Prevent cycle in Winbind's list of children when reaping dead processes.
o Steven Danneman <steven.danneman at isilon.com>
@@ -139,7 +139,7 @@ o Jim McDonough <jmcd at samba.org>
o Karolin Seeger <kseeger at samba.org>
- * Documentation cleanup after r emerging docs from svn to git and
+ * Documentation cleanup after merging docs from svn to git and
back-porting from the v3-2 branch.
diff --git a/docs-xml/manpages-3/winbindd.8.xml b/docs-xml/manpages-3/winbindd.8.xml
index a52a4c2..3da5991 100644
--- a/docs-xml/manpages-3/winbindd.8.xml
+++ b/docs-xml/manpages-3/winbindd.8.xml
@@ -45,15 +45,14 @@
<para>Even if winbind is not used for nsswitch, it still provides a
service to <command>smbd</command>, <command>ntlm_auth</command>
and the <command>pam_winbind.so</command> PAM module, by managing connections to
- domain controllers. In this configuraiton the
- <smbconfoption name="idmap uid"/> and
- <smbconfoption name="idmap gid"/>
+ domain controllers. In this configuration the
+ <smbconfoption name="idmap uid"/> and <smbconfoption name="idmap gid"/>
parameters are not required. (This is known as `netlogon proxy only mode'.)</para>
- <para> The Name Service Switch allows user
+ <para>The Name Service Switch allows user
and system information to be obtained from different databases
services such as NIS or DNS. The exact behaviour can be configured
- throught the <filename>/etc/nsswitch.conf</filename> file.
+ through the <filename>/etc/nsswitch.conf</filename> file.
Users and groups are allocated as they are resolved to a range
of user and group ids specified by the administrator of the
Samba system.</para>
@@ -61,13 +60,12 @@
<para>The service provided by <command>winbindd</command> is called `winbind' and
can be used to resolve user and group information from a
Windows NT server. The service can also provide authentication
- services via an associated PAM module. </para>
+ services via an associated PAM module.</para>
<para>
The <filename>pam_winbind</filename> module supports the
<parameter>auth</parameter>, <parameter>account</parameter>
- and <parameter>password</parameter>
- module-types. It should be noted that the
+ and <parameter>password</parameter> module-types. It should be noted that the
<parameter>account</parameter> module simply performs a getpwnam() to verify that
the system can obtain a uid for the user, as the domain
controller has already performed access control. If the
@@ -119,12 +117,17 @@
resolve user and group information from <filename>/etc/passwd
</filename> and <filename>/etc/group</filename> and then from the
Windows NT server.
+ </para>
+
<programlisting>
passwd: files winbind
group: files winbind
-## only available on IRIX; Linux users should us libnss_wins.so
-hosts: files dns winbind
-</programlisting></para>
+## only available on IRIX: use winbind to resolve hosts:
+# hosts: files dns winbind
+## All other NSS enabled systems should use libnss_wins.so like this:
+hosts: files dns wins
+
+</programlisting>
<para>The following simple configuration in the
<filename>/etc/nsswitch.conf</filename> file can be used to initially
diff --git a/source/utils/net_help.c b/source/utils/net_help.c
index 369fc09..69023f5 100644
--- a/source/utils/net_help.c
+++ b/source/utils/net_help.c
@@ -61,7 +61,7 @@ static int help_usage(int argc, const char **argv)
"Valid functions are:\n"\
" RPC RAP ADS FILE SHARE SESSION SERVER DOMAIN PRINTQ USER GROUP VALIDATE\n"\
" GROUPMEMBER ADMIN SERVICE PASSWORD TIME LOOKUP GETLOCALSID SETLOCALSID\n"\
-" SETDOMAINSID CHANGESCRETPW LOOKUP SAM\n");
+" GETDOMAINSID SETDOMAINSID CHANGESCRETPW LOOKUP SAM\n");
return -1;
}
@@ -228,14 +228,15 @@ static int net_usage(int argc, const char **argv)
" net groupmap\t\tto manage group mappings\n"\
" net join\t\tto join a domain\n"\
" net cache\t\tto operate on cache tdb file\n"\
- " net getlocalsid [NAME]\tto get the SID for local name\n"\
+ " net getlocalsid [NAME]\tto get the SID for local machine name\n"\
" net setlocalsid SID\tto set the local domain SID\n"\
+ " net getdomainsid the machine SID and the domain SID on the local server\n"\
" net setdomainsid SID\tto set the domain SID on member servers\n"\
" net changesecretpw\tto change the machine password in the local secrets database only\n"\
" \tthis requires the -f flag as a safety barrier\n"\
" net status\t\tShow server status\n"\
- " net usersidlist\tto get a list of all users with their SIDs\n"
- " net usershare\t\tto add, delete and list locally user-modifiable shares\n"
+ " net usersidlist\tto get a list of all users with their SIDs\n"
+ " net usershare\t\tto add, delete and list locally user-modifiable shares\n"
"\n"\
" net ads <command>\tto run ADS commands\n"\
" net rap <command>\tto run RAP (pre-RPC) commands\n"\
--
Samba Shared Repository
More information about the samba-cvs
mailing list