Author: jerry
Date: 2005-10-07 11:59:30 +0000 (Fri, 07 Oct 2005)
New Revision: 10813

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

Log:
syncing some cahnges back from 3.0 (mostly formaatting or non-code)
Modified:
   trunk/MAINTAINERS
   trunk/Manifest
   trunk/Roadmap
   trunk/packaging/Fedora/samba.spec.tmpl
   trunk/source/nsswitch/winbindd_dual.c


Changeset:
Modified: trunk/MAINTAINERS
===================================================================
--- trunk/MAINTAINERS   2005-10-07 11:50:46 UTC (rev 10812)
+++ trunk/MAINTAINERS   2005-10-07 11:59:30 UTC (rev 10813)
@@ -2,4 +2,30 @@
 ## List of current Samba Maintainers 
 ##
 
+This file contains a list of developers responsible for 
+portions of the Samba 3.0 code.  It also lists developers
+responsible for 3rd party projects that work with Samba
+(e.g. vfs modules).
 
+Note that this list is for you benefit, but please do not
+abuse it by constantly emailing a stream of help questions
+to the maintainers.  Some are more open to direct 
+communication than others and some struggle with enormous
+amounts of email every day.
+
+All bug reports for code that is maintained *within* the 
+Samba subversion tree should be filed at https://bugzilla.samba.org/.
+
+
+Feature/Function       Developer
+----------------       ---------
+
+samba-vscan            Rainer Link <[EMAIL PROTECTED]>
+pdb_mysql              Jelmer Vernooij <[EMAIL PROTECTED]>
+General Documentation  John Terpstra <[EMAIL PROTECTED]>
+
+Printing               Gerald (Jerry) Carter <[EMAIL PROTECTED]>
+
+
+--
+Please report any errors in this file to <[EMAIL PROTECTED]>

Modified: trunk/Manifest
===================================================================
--- trunk/Manifest      2005-10-07 11:50:46 UTC (rev 10812)
+++ trunk/Manifest      2005-10-07 11:59:30 UTC (rev 10813)
@@ -15,7 +15,7 @@
 
        The Samba HOWTO Collection has undergone some rather large changes 
        and covers all parts of configuration now. It is available 
-       as PDF (docs/Samba-HOWTO-Collection.pdf) or in HTML format (in 
+       as PDF (docs/Samba3-HOWTO.pdf) or in HTML format (in 
        the docs/htmldocs directory). Those with the docbook utilities 
installed 
        can generate PostScript and text versions of the HOWTO as well.
 
@@ -38,7 +38,7 @@
 
        Currently support is included for the following Linux Distributions :
        
-               Pacfic HiTech, RedHat and SuSE.
+               RedHat and SuSE.
 
        In addition, packaging support is available for SGI and Solaris systems.
        We hope that other Unix OS vendors will contribute their binary

Modified: trunk/Roadmap
===================================================================
--- trunk/Roadmap       2005-10-07 11:50:46 UTC (rev 10812)
+++ trunk/Roadmap       2005-10-07 11:59:30 UTC (rev 10813)
@@ -9,12 +9,17 @@
 The following development objectives for future releases
 are in progress:
 ----------------------------------------------------------------------------
-Samba-3.0.0            The Domain Integration Release.
+Samba-3.0.20   The release that is focussing on scalability and domain
+                               integration and migration. See the WHATSNEW.txt 
file for
+                               update notes.
 
 Samba-3.0.x            Improvements in Management and Migration tools, &
-                       general code stabilization work.
+                               general code stabilization work. It is 
recommended to use
+                               only stable releases in production 
environments. You have
+                               been duly warned!
 
-Samba-3.x.x            Requirements are currently under discussion.
+Samba-3.1.x            The test bed for all new developments. Do NOT use in any
+                               production environment.
 
 Samba-4                        Danger Will Robinson, a big code clean up with 
major
                        system redesign. More will be announced as this work

Modified: trunk/packaging/Fedora/samba.spec.tmpl
===================================================================
--- trunk/packaging/Fedora/samba.spec.tmpl      2005-10-07 11:50:46 UTC (rev 
10812)
+++ trunk/packaging/Fedora/samba.spec.tmpl      2005-10-07 11:59:30 UTC (rev 
10813)
@@ -269,6 +269,8 @@
 %doc examples/printing
 
 %attr(755,root,root) /%{_lib}/security/pam_smbpass.so
+%{_sbindir}/samba
+%{_sbindir}/winbind
 %{_sbindir}/smbd
 %{_sbindir}/nmbd
 %{_bindir}/mksmbpasswd.sh

Modified: trunk/source/nsswitch/winbindd_dual.c
===================================================================
--- trunk/source/nsswitch/winbindd_dual.c       2005-10-07 11:50:46 UTC (rev 
10812)
+++ trunk/source/nsswitch/winbindd_dual.c       2005-10-07 11:59:30 UTC (rev 
10813)
@@ -341,39 +341,30 @@
 
 static struct winbindd_child_dispatch_table child_dispatch_table[] = {
        
-       { WINBINDD_LOOKUPSID, winbindd_dual_lookupsid, "LOOKUPSID" },
-       { WINBINDD_LOOKUPSIDS, winbindd_dual_lookupsids, "LOOKUPSIDS" },
-       { WINBINDD_LOOKUPNAME, winbindd_dual_lookupname, "LOOKUPNAME" },
-       { WINBINDD_LIST_TRUSTDOM, winbindd_dual_list_trusted_domains,
-         "LIST_TRUSTDOM" },
-       { WINBINDD_INIT_CONNECTION, winbindd_dual_init_connection,
-         "INIT_CONNECTION" },
-       { WINBINDD_GETDCNAME, winbindd_dual_getdcname, "GETDCNAME" },
-       { WINBINDD_SHOW_SEQUENCE, winbindd_dual_show_sequence,
-         "SHOW_SEQUENCE" },
-       { WINBINDD_PAM_AUTH, winbindd_dual_pam_auth, "PAM_AUTH" },
-       { WINBINDD_PAM_AUTH_CRAP, winbindd_dual_pam_auth_crap, "AUTH_CRAP" },
-       { WINBINDD_CHECK_MACHACC, winbindd_dual_check_machine_acct,
-         "CHECK_MACHACC" },
-       { WINBINDD_DUAL_SID2UID, winbindd_dual_sid2uid, "DUAL_SID2UID" },
-       { WINBINDD_DUAL_SID2GID, winbindd_dual_sid2gid, "DUAL_SID2GID" },
-       { WINBINDD_DUAL_UID2NAME, winbindd_dual_uid2name, "DUAL_UID2NAME" },
-       { WINBINDD_DUAL_NAME2UID, winbindd_dual_name2uid, "DUAL_NAME2UID" },
-       { WINBINDD_DUAL_GID2NAME, winbindd_dual_gid2name, "DUAL_GID2NAME" },
-       { WINBINDD_DUAL_NAME2GID, winbindd_dual_name2gid, "DUAL_NAME2GID" },
-       { WINBINDD_DUAL_IDMAPSET, winbindd_dual_idmapset, "DUAL_IDMAPSET" },
-       { WINBINDD_DUAL_USERINFO, winbindd_dual_userinfo, "DUAL_USERINFO" },
-       { WINBINDD_ALLOCATE_RID, winbindd_dual_allocate_rid, "ALLOCATE_RID" },
-       { WINBINDD_ALLOCATE_RID_AND_GID, winbindd_dual_allocate_rid_and_gid,
-         "ALLOCATE_RID_AND_GID" },
-       { WINBINDD_GETUSERDOMGROUPS, winbindd_dual_getuserdomgroups,
-         "GETUSERDOMGROUPS" },
-       { WINBINDD_DUAL_GETSIDALIASES, winbindd_dual_getsidaliases,
-         "GETSIDALIASES" },
-       { WINBINDD_QUERY_ALIASMEM, winbindd_dual_query_aliasmem,
-         "QUERY_ALIASMEM" },
-       { WINBINDD_QUERY_GROUPMEM, winbindd_dual_query_groupmem,
-         "QUERY_GROUPMEM" },
+       { WINBINDD_LOOKUPSID,            winbindd_dual_lookupsid,             
"LOOKUPSID" },
+       { WINBINDD_LOOKUPSIDS,           winbindd_dual_lookupsids,            
"LOOKUPSIDS" },
+       { WINBINDD_LOOKUPNAME,           winbindd_dual_lookupname,            
"LOOKUPNAME" },
+       { WINBINDD_LIST_TRUSTDOM,        winbindd_dual_list_trusted_domains,  
"LIST_TRUSTDOM" },
+       { WINBINDD_INIT_CONNECTION,      winbindd_dual_init_connection,       
"INIT_CONNECTION" },
+       { WINBINDD_GETDCNAME,            winbindd_dual_getdcname,             
"GETDCNAME" },
+       { WINBINDD_SHOW_SEQUENCE,        winbindd_dual_show_sequence,         
"SHOW_SEQUENCE" },
+       { WINBINDD_PAM_AUTH,             winbindd_dual_pam_auth,              
"PAM_AUTH" },
+       { WINBINDD_PAM_AUTH_CRAP,        winbindd_dual_pam_auth_crap,         
"AUTH_CRAP" },
+       { WINBINDD_CHECK_MACHACC,        winbindd_dual_check_machine_acct,    
"CHECK_MACHACC" },
+       { WINBINDD_DUAL_SID2UID,         winbindd_dual_sid2uid,               
"DUAL_SID2UID" },
+       { WINBINDD_DUAL_SID2GID,         winbindd_dual_sid2gid,               
"DUAL_SID2GID" },
+       { WINBINDD_DUAL_UID2NAME,        winbindd_dual_uid2name,              
"DUAL_UID2NAME" },
+       { WINBINDD_DUAL_NAME2UID,        winbindd_dual_name2uid,              
"DUAL_NAME2UID" },
+       { WINBINDD_DUAL_GID2NAME,        winbindd_dual_gid2name,              
"DUAL_GID2NAME" },
+       { WINBINDD_DUAL_NAME2GID,        winbindd_dual_name2gid,              
"DUAL_NAME2GID" },
+       { WINBINDD_DUAL_IDMAPSET,        winbindd_dual_idmapset,              
"DUAL_IDMAPSET" },
+       { WINBINDD_DUAL_USERINFO,        winbindd_dual_userinfo,              
"DUAL_USERINFO" },
+       { WINBINDD_ALLOCATE_RID,         winbindd_dual_allocate_rid,          
"ALLOCATE_RID" },
+       { WINBINDD_QUERY_ALIASMEM,       winbindd_dual_query_aliasmem,        
"QUERY_ALIASMEM" },
+       { WINBINDD_QUERY_GROUPMEM,       winbindd_dual_query_groupmem,        
"QUERY_GROUPMEM" },
+       { WINBINDD_ALLOCATE_RID_AND_GID, winbindd_dual_allocate_rid_and_gid,  
"ALLOCATE_RID_AND_GID" },
+       { WINBINDD_GETUSERDOMGROUPS,     winbindd_dual_getuserdomgroups,      
"GETUSERDOMGROUPS" },
+       { WINBINDD_DUAL_GETSIDALIASES,   winbindd_dual_getsidaliases,         
"GETSIDALIASES" },
        /* End of list */
 
        { WINBINDD_NUM_CMDS, NULL, "NONE" }

Reply via email to