Changeset 165 for branches

Timestamp:

Mar 11, 2009, 9:14:55 AM (16 years ago)

Author:

Paul Smedley

Message:

Add 'missing' 3.0.34 diffs

Location:

branches/samba-3.0

Files:

• WHATSNEW.txt (modified) (5 diffs)
• packaging/RHEL/makerpms.sh (modified) (1 diff)
• packaging/RHEL/samba.spec (modified) (1 diff)
• source/Makefile.in (modified) (7 diffs)
• source/auth/pampass.c (modified) (3 diffs)
• source/client/client_proto.h (modified) (2 diffs)
• source/client/mount.cifs.c (modified) (47 diffs)
• source/client/umount.cifs.c (modified) (3 diffs)
• source/configure.in (modified) (4 diffs)
• source/include/ads.h (modified) (1 diff)
• source/include/config.h.in (modified) (3 diffs)
• source/include/rpc_dce.h (modified) (1 diff)
• source/include/rpc_netlogon.h (modified) (2 diffs)
• source/include/smb.h (modified) (2 diffs)
• source/lib/charcnv.c (modified) (46 diffs)
• source/lib/debug.c (modified) (2 diffs)
• source/lib/events.c (modified) (3 diffs)
• source/lib/genrand.c (modified) (1 diff)
• source/lib/iconv.c (modified) (1 diff)
• source/lib/interfaces.c (modified) (1 diff)
• source/lib/messages.c (modified) (1 diff)
• source/lib/replace/autoconf-2.60.m4 (modified) (2 diffs)
• source/lib/select.c (modified) (2 diffs)
• source/lib/util.c (modified) (2 diffs)
• source/lib/util_sock.c (modified) (1 diff)
• source/lib/util_tdb.c (modified) (1 diff)
• source/libads/ldap.c (modified) (4 diffs)
• source/libsmb/cliconnect.c (modified) (4 diffs)
• source/libsmb/libsmbclient.c (modified) (7 diffs)
• source/libsmb/namequery.c (modified) (7 diffs)
• source/libsmb/trusts_util.c (modified) (3 diffs)
• source/nsswitch/pam_winbind.c (modified) (1 diff)
• source/nsswitch/winbind_nss_solaris.c (modified) (9 diffs)
• source/nsswitch/winbindd.c (modified) (4 diffs)
• source/nsswitch/winbindd_ads.c (modified) (4 diffs)
• source/nsswitch/winbindd_cm.c (modified) (7 diffs)
• source/nsswitch/winbindd_cred_cache.c (modified) (14 diffs)
• source/nsswitch/winbindd_dual.c (modified) (13 diffs)
• source/nsswitch/winbindd_nss.h (modified) (1 diff)
• source/nsswitch/winbindd_pam.c (modified) (1 diff)
• source/nsswitch/winbindd_passdb.c (modified) (1 diff)
• source/nsswitch/winbindd_proto.h (modified) (2 diffs)
• source/nsswitch/winbindd_rpc.c (modified) (6 diffs)
• source/nsswitch/winbindd_util.c (modified) (2 diffs)
• source/param/loadparm.c (modified) (2 diffs)
• source/printing/print_generic.c (modified) (1 diff)
• source/rpc_client/cli_netlogon.c (modified) (1 diff)
• source/rpc_parse/parse_net.c (modified) (1 diff)
• source/rpc_server/srv_srvsvc_nt.c (modified) (6 diffs)
• source/script/uninstalldat.sh (modified) ( previous)
• source/script/uninstallmsg.sh (modified) ( previous)
• source/script/uninstallswat.sh (modified) ( previous)
• source/smbd/aio.c (modified) (2 diffs)
• source/smbd/build_options.c (modified) (3 diffs)
• source/smbd/conn.c (modified) (1 diff)
• source/smbd/dosmode.c (modified) (2 diffs)
• source/smbd/files.c (modified) (1 diff)
• source/smbd/msdfs.c (modified) (5 diffs)
• source/smbd/notify.c (modified) (1 diff)
• source/smbd/password.c (modified) (2 diffs)
• source/smbd/posix_acls.c (modified) (6 diffs)
• source/smbd/process.c (modified) (1 diff)
• source/smbd/reply.c (modified) (3 diffs)
• source/smbd/server.c (modified) (4 diffs)
• source/smbd/sesssetup.c (modified) (6 diffs)
• source/smbd/share_access.c (modified) (2 diffs)
• source/smbd/trans2.c (modified) (6 diffs)
• source/smbd/uid.c (modified) (5 diffs)
• source/tdb/common/io.c (modified) (2 diffs)
• source/tdb/common/open.c (modified) (3 diffs)
• source/tdb/common/transaction.c (modified) (1 diff)
• source/utils/net_ads.c (modified) (2 diffs)
• source/utils/net_rpc.c (modified) (1 diff)
• source/utils/ntlm_auth.c (modified) (1 diff)
• source/utils/smbtree.c (modified) (3 diffs)
• source/web/statuspage.c (modified) (1 diff)
• source/web/swat.c (modified) (1 diff)

branches/samba-3.0/WHATSNEW.txt

@@ +1 @@
+                   ==============================
+                   Release Notes for Samba 3.0.34
+                         January, 20 2009
+                   ==============================
+
+
+This is a bug fix release of the Samba 3.0 series.
+
+Major enhancements included in Samba 3.0.34 are:
+
+  o Fix update of machine account passwords.
+  o Fix SMB signing issue on Windows Vista with MS Hotfix KB955302.
+  o Fix Winbind crashes.
+  o Correctly detect if the current dc is the closest one.
+  o Add saf_join_store() function to memorize the dc used at join time.
+    This avoids problems caused by replication delays shortly after domain
+    joins.
+  o Fix write list in setups using "security = share".
+
+
+######################################################################
+Changes
+#######
+
+Changes since 3.0.33
+--------------------
+
+
+o   Michael Adam <obnox@samba.org>
+    * Fix linking cifs.upcall when nscd_flush_cache() is found.
+    * Fix smbd hanging on Solaris when winbindd closes socket.
+    * Use the reconnect methods instead of the rpc methods directly.
+
+
+o   Jeremy Allison <jra@samba.org>
+    * BUG 1254: Fix write list in setups using "security = share".
+    * BUG 5052: Not work cancel inheritance on share.
+    * BUG 5729: Explicitly allow "-valid" parameter.
+    * BUG 5737: Fix Winbind crash in an unusual failure mode.
+    * BUG 5750: Fix SMB signing issue on Windows Vista with MS Hotfix KB955302.
+    * BUG 5751: Backport to fix showing of ACLson DFS with smbclient.
+    * BUG 5790: Fix returning STATUS_OBJECT_NAME_NOT_FOUND on set file
+      disposition call.
+    * BUG 5814: Fix core dump of Winbind while doing "rescan_trusted_domain".
+    * BUG 5873: Fix ACL inheritance.
+    * BUG 5914: Fix build failure (redefinition of struct name_list).
+    * BUG 5937: Fix filenames with "*" char hiding other files.
+    * BUG 6019: File corruption in Clustered SMB/NFS environment
+      managed via CTDB.
+    * BUG 6035: Fix possible race between fcntl F_SETLKW and alarm delivery.
+    * Remove unecessary msync.
+    * Rename cifs.spnego to cifs.upcall.
+    * Fix segfault when execution cifs.upcall without any arguments.
+    * Ensure we emit the notify message before renaming the open files.
+    * Fix use of DLIST_REMOVE.
+    * Cope with bad trans2mkdir requests from System in QNTC IBM SMB client.
+    * Fix memory leak in error path.
+    * Fix logic bug introduced in backport of ccache_regain_all_now.
+
+
+o   Kai Blin <kai@samba.org>
+    * Reformat the WBFLAGS defines to prepare for adding a new flag.
+    * Put huge NTLMv2 blobs into extra_data on CRAP auth.
+
+
+o   GÃŒnther Deschner <gd@samba.org>
+    * BUG 5710: Fix update of machine account passwords.
+    * Define NET_SRVPWSET2 call.
+    * Net should just use machine account creds when changing passwords.
+    * Fix net_io_q_srv_pwset2.
+
+
+o   Carsten Dumke <carsten@cdumke.de>
+    * BUG 5892: Fix documentation of net rap printq info.
+
+
+o   Dina Fine <dina@exanet.com>
+    * BUG 5908: Fix failing of internal change notify on share directory.
+
+
+o   Steve French <stevef@smf-t60p.smfdom>
+    * Fix compile warning in cifs.upcall.
+    * Fix cifs.upcall manpage and comments.
+
+
+o   Jeff Layton <jlayton@redhat.com>
+    * Build cifs.upcall by default on Linux.
+    * Fix negatively instantiate keys on error in cifs.upcall.
+    * Handle handle MSKRB5 OID properly in cifs.upcall.
+    * Bump SPNEGO msg version number and don't reject old versions in
+      cifs.upcall.
+    * Fix several problems when mounting subdirectories of shares in
+      mount.cifs.
+    * Don't prompt for password on krb5 mounts in mount.cifs.
+    * Have uppercase_string return success on NULL pointer in mount.cifs.
+    * Make return codes match the return codes for /bin/mount in mount.cifs.
+    * Use lock/unlock_mtab scheme from util-linux-ng mount prog.
+
+
+o   Volker Lendecke <vl@samba.org>
+    * BUG 5965: Fix creation of the first share using SWAT.
+    * Fix bug triggered by the RAW-SAMBA3OPLOCKLOGOFF test.
+
+
+o   David Leonard <David.Leonard@quest.com>
+    * BUG 4516: No IPv6 on Solaris 2.6.
+
+
+o   Igor Mammedov <niallain@gmail.com>
+    * Add support for cifs.spnego helper into configure and Makefile.in.
+    * Add checks for spnego prereq keyutils.h and kerberos in configure.in.
+    * Add helper source for handling cifs kernel module upcall for kerberos
+      authorization.
+    * Add -c option to set service prefix to "cifs" in service principal by
+      default service prefix "host" is used.
+    * Add support for cifs.resolver upcall.
+
+
+o   Stefan Metzmacher <metze@samba.org>
+    * Correctly detect if the current dc is the closest one.
+    * For CLDAP we need to use get_sorted_dc_list() to avoid recursion.
+    * Add fallback to return all dcs, when none is available in the requested
+      site.
+    * Add saf_join_store() function to memorize the dc used at join time.
+    * Return an error instead of crashing when no realm is given.
+    * Handle the SMB signing states the same in the krb5 and ntlmssp cases.
+
+
+o   Andreas Schneider <mail@cynapses.org>
+    * Delete the krb5 ccname variable from the PAM environment if set.
+    * Fix the build of pam_winbind.
+    * Fix circular dependency error with autoconf 2.6.3.
+
+
+o   Simo Sorce <idra@samba.org>
+    * Fix an ifdef check.
+    * Fix warning.
+
+
+o   Yasuma Takeda <yasuma@osstech.co.jp>
+    * BUG 5909: Fix MS-DFS links inlcuding multibyte characters on Vista.
+
+
+o   Andrew Tridgell <tridge@samba.org>
+    * Avoid a race condition in glibc between AIO and setresuid().
+    * Become root for AIO operations.
+
+
+o   Bo Yang <boyang@novell.com>
+    * Don't set child->requests to NULL in parent after fork.
+    * Backport of the clean event context after fork and krb5
+      refresh chain fixes.
+    * Fix null pointer refrence in event context in backport from v3-3-test.
+
+
+o   Qiao Yang <geoyang@ironport.com>
+    * Fix a memleak.
+
+
+######################################################################
+Reporting bugs & Development Discussion
+#######################################
+
+Please discuss this release on the samba-technical mailing list or by
+joining the #samba-technical IRC channel on irc.freenode.net.
+
+If you do report problems then please try to send high quality
+feedback. If you don't provide vital information to help us track down
+the problem then you will probably be ignored.  All bug reports should
+be filed under the Samba 3.0 product in the project's Bugzilla
+database (https://bugzilla.samba.org/).
+
+
+======================================================================
+== Our Code, Our Bugs, Our Responsibility.
+== The Samba Team
+======================================================================
+
+
+Release notes for older releases follow:
+      --------------------------------------------------
+                   ==============================
+                   Release Notes for Samba 3.0.33
+                         November, 27 2008
+                   ==============================
+
+
+This is a security release in order to address CVE-2008-4314 ("Potential leak of
+arbitrary memory contents").
+
+   o CVE-2008-4314
+     Samba 3.0.29 to 3.2.4 can potentially leak
+     arbitrary memory contents to malicious
+     clients.
+
+The original security announcement for this and past advisories can
+be found http://www.samba.org/samba/security/
+
+######################################################################
+Changes
+#######
+
+Changes since 3.0.32
+--------------------
+
+
+o   Volker Lendecke <vl@samba.org>
+    * Fix for CVE-2008-4314.
+
+
+      --------------------------------------------------
                    ===============================
                    Release Notes for Samba 3.0.32
@@ -61 +272 @@
     * Corrections to various man pages.
 
-
-
-
-Release notes for older releases follow:
 
       --------------------------------------------------
@@ -548 +755 @@
 
 
-Release notes for older releases follow:
-
-      --------------------------------------------------
 
                    ==============================
@@ -583 +787 @@
 
 
-
       --------------------------------------------------
 
+                   ===============================
+                   Release Notes for Samba 3.0.27a
+                             Nov 20, 2007
+                   ===============================
+
+Samba 3.0.27a is a bug fix release and is the current release
+for production servers running the Samba 3.0 series.
+
+Important fixes in 3.0.27a include:
+
+  o A crash bug regression experienced by smbfs clients caused
+    by the fix for CVE-2007-4572.
+
+
+
+######################################################################
+Changes
+#######
+
+Changes since 3.0.27
+--------------------
+
+o   Michael Adam <obnox@samba.org>
+    * BUG 4308: Add missing become_root/unbecome_root around calls of 
+      add_aliases.  Add same changes in create_token_from_username()
+      surrounding the call to getsampwsid().
+    * BUG 5083: Make solarisacl_sys_acl_get_fd() return a result when 
+      there is one (thereby fixing a memleak).
+    * BUG 5023: Fix smbd's interaction with NFSv4 ACL compatible VFS 
+      plugins such as GPFS and ZFS.
+
+
+o   Jeremy Allison <jra@samba.org>
+    * BUG 4978: Ensure that DOS attributes are copied with folders.
+    * Fix bug where tdb lock call interrupted with an alarm sig would 
+      not terminate and could lead to runaway smbd processes.
+    * Fix smbd crash bug which resulted from a regression in the patch
+      for CVE-2007-4572 patch.
+    * Prevent nmbd from adding non-initialized name to IP address
+      mappings to it's WINS database.
+
+
+o   Dmitry Butskoy <buc@odusz.so-cdu.ru>
+    * Properly catch errors in the query_user() callback to avoid
+      generated struct passwd replies with zero length usernames.
+
+
+o   Gerald (Jerry) Carter <jerry@samba.org>
+    * Prevent segv in winbindd running on a DC using the "idmap
+      backend" syntax.
+
+
+o   Steve Langasek <vorlon@debian.org>
+    * BUG 4781: Allow cleaning of /etc/mtab by canonicalizing mountpoint.
+
+
+o   Volker Lendecke <vl@samba.org>
+    * BUG 4028: Fix message popup sent via "smbclient -M".
+    * BUG 4984: Filename unix_convert() fixes for WinNT 4.0 clients.
+
+
+o   Stefan Metzmacher <metze@samba.org>
+    * Fix crash bug in pidl generated client code caused by
+      [in,out,unique] pointers.
+    * Fix crash bug in the group mapping code.
+
+
+o   Heinrich Mislik <Heinrich.Mislik@univie.ac.at>
+    * Fixes for AIX quota support.
+
+
+o   Tomasz Ostrowski <tometzky@batory.org.pl>
+    * BUG 4393: Prevent smbclient from dropping 0 bytes files from tar 
+      archives.
+
+
+o   Simo Sorce <idra@samba.org>
+    * Fixes for internal idmap domain list when "winbind trusted
+      domains only" is enabled.
+    * Fix 32/64-bit compatibility issues in the winbind request/response
+      structures.
+
+
+o   Martin Zielinski <mz@seh.de>
+    * Error code path fix for get_mydnsdomname().
+
+
+
+      --------------------------------------------------
+
+                   ==============================
+                   Release Notes for Samba 3.0.27
+                            Nov 15, 2007
+                   ==============================
+
+Samba 3.0.27 is a security release in order to address the following
+defects:
+
+  o CVE-2007-4572
+    Stack buffer overflow in nmbd's logon request processing.
+
+  o CVE-2007-5398
+    Remote code execution in Samba's WINS server daemon (nmbd) 
+    when processing name registration followed name query requests.
+
+The original security announcement for this and past advisories can 
+be found http://www.samba.org/samba/security/
+
+######################################################################
+Changes
+#######
+
+Changes since 3.0.26a
+---------------------
+
+o   Jeremy Allison <jra@samba.org>
+    * Fix for CVE-2007-4572.
+    * Fix for CVE-2007-5398.
+
+
+o   Simo Sorce <idra@samba.org>
+    * Additional fixes for CVE-2007-4572.
+
+
+      --------------------------------------------------
                    ===============================
                    Release Notes for Samba 3.0.26a
                              Sep 11, 2007
                    ===============================
-
-This is a bug fix release of the Samba 3.0.26 code base and is the 
-version that servers should be run for for all current bug Samba 3.0.x
-fixes.  
 
 Major bug fixes included in Samba 3.0.26a are:
@@ -654 +978 @@
     * BUG 4772: Fix us of ldap_base_dn for the idmap_ldap plugin.
 
+
+Release notes for older releases follow:
 
       --------------------------------------------------

branches/samba-3.0/packaging/RHEL/makerpms.sh

@@ -21 +21 @@
 USERID=`id -u`
 GRPID=`id -g`
-VERSION='3.0.32'
+VERSION='3.0.34'
 REVISION=''
 SPECFILE="samba.spec"

branches/samba-3.0/packaging/RHEL/samba.spec

@@ -6 +6 @@
 Packager: Samba Team <samba@samba.org>
 Name:         samba
-Version:      3.0.32
+Version:      3.0.34
 Release:      1
 Epoch:        0

branches/samba-3.0/source/Makefile.in

@@ -145 +145 @@
 # Note that all executable programs now provide for an optional executable suffix.
 
-SBIN_PROGS = bin/smbd@EXEEXT@ bin/nmbd@EXEEXT@ bin/swat@EXEEXT@ @EXTRA_SBIN_PROGS@
+SBIN_PROGS = bin/smbd@EXEEXT@ bin/nmbd@EXEEXT@ bin/swat@EXEEXT@ @EXTRA_SBIN_PROGS@ @CIFSUPCALL_PROGS@
 
 ROOT_SBIN_PROGS = @CIFSMOUNT_PROGS@
@@ -643 +643 @@
 UMOUNT_OBJ = client/smbumount.o $(SOCKET_WRAPPER_OBJ)
 
-CIFS_MOUNT_OBJ = client/mount.cifs.o
-
-CIFS_UMOUNT_OBJ = client/umount.cifs.o
+CIFS_MOUNT_OBJ = client/mount.cifs.o client/mtab.o
+
+CIFS_UMOUNT_OBJ = client/umount.cifs.o client/mtab.o
+
+CIFS_UPCALL_OBJ = client/cifs.upcall.o
 
 NMBLOOKUP_OBJ = utils/nmblookup.o $(PARAM_OBJ) $(LIBNMB_OBJ) $(RPC_PARSE_OBJ1) $(DOSERR_OBJ) \
@@ -1023 +1025 @@
         @$(CC) $(FLAGS) -o $@ $(CIFS_UMOUNT_OBJ) $(DYNEXP) $(LDFLAGS)
 
+bin/cifs.upcall@EXEEXT@: $(BINARY_PREREQS) $(CIFS_UPCALL_OBJ) $(LIBSMBCLIENT_OBJ) bin/.dummy
+        @echo Linking $@
+        @$(CC) $(FLAGS) -o $@ $(CIFS_UPCALL_OBJ) $(DYNEXP) $(LDFLAGS) -lkeyutils $(LIBS) \
+                $(LIBSMBCLIENT_OBJ) $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS)
+
 bin/testparm@EXEEXT@: proto_exists $(TESTPARM_OBJ) @BUILD_POPT@ bin/.dummy
         @echo Linking $@
@@ -1567 +1574 @@
         @$(CC) $(FLAGS) -o $@ $(DYNEXP) script/tests/timelimit.o
 
-install: installservers installbin @INSTALL_CIFSMOUNT@ installman installscripts installdat installswat installmodules @INSTALL_LIBSMBCLIENT@ @INSTALL_LIBMSRPC@ @INSTALL_PAM_MODULES@ @INSTALL_LIBSMBSHAREMODES@
-
+install: installservers installbin @INSTALL_CIFSMOUNT@ @INSTALL_CIFSUPCALL@ installman installscripts installdat installswat installmodules @INSTALL_LIBSMBCLIENT@ @INSTALL_LIBMSRPC@ @INSTALL_PAM_MODULES@ @INSTALL_LIBSMBSHAREMODES@
 
 install-everything: install installmodules
@@ -1592 +1598 @@
         @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR) $(ROOTSBINDIR)
         @$(SHELL) script/installbin.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(ROOTSBINDIR) @CIFSMOUNT_PROGS@
+
+installcifsupcall: @CIFSUPCALL_PROGS@
+        @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(SBINDIR)
+        @$(SHELL) script/installbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(SBINDIR) @CIFSUPCALL_PROGS@
 
 # Some symlinks are required for the 'probing' of modules.
@@ -1710 +1720 @@
 
 
-uninstall: uninstallman uninstallservers uninstallbin @UNINSTALL_CIFSMOUNT@ uninstallscripts uninstalldat uninstallswat uninstallmodules @UNINSTALL_LIBSMBCLIENT@ @UNINSTALL_LIBMSRPC@ @UNINSTALL_PAM_MODULES@ @UNINSTALL_LIBSMBSHAREMODES@
+uninstall: uninstallman uninstallservers uninstallbin @UNINSTALL_CIFSMOUNT@ @UNINSTALL_CIFSUPCALL@ uninstallscripts uninstalldat uninstallswat uninstallmodules @UNINSTALL_LIBSMBCLIENT@ @UNINSTALL_LIBMSRPC@ @UNINSTALL_PAM_MODULES@ @UNINSTALL_LIBSMBSHAREMODES@
 
 uninstallman:
@@ -1723 +1733 @@
 uninstallcifsmount:
         @$(SHELL) script/uninstallbin.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(ROOTSBINDIR) @CIFSMOUNT_PROGS@
+
+uninstallcifsupcall:
+        @$(SHELL) script/uninstallbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(ROOTSBINDIR) @CIFSUPCALL_PROGS@
 
 uninstallmodules:

branches/samba-3.0/source/auth/pampass.c

@@ -61 +61 @@
  */
 #define COPY_STRING(s) (s) ? SMB_STRDUP(s) : NULL
+#define COPY_FSTRING(s) (s[0]) ? SMB_STRDUP(s) : NULL
 
 /*******************************************************************
@@ -318 +319 @@
 #endif
                                         reply[replies].resp_retcode = PAM_SUCCESS;
-                                        reply[replies].resp = COPY_STRING(current_reply);
+                                        reply[replies].resp = COPY_FSTRING(current_reply);
                                         found = True;
                                         break;
@@ -346 +347 @@
                                         pwd_sub(current_reply, udp->PAM_username, udp->PAM_password, udp->PAM_newpassword);
                                         reply[replies].resp_retcode = PAM_SUCCESS;
-                                        reply[replies].resp = COPY_STRING(current_reply);
+                                        reply[replies].resp = COPY_FSTRING(current_reply);
 #ifdef DEBUG_PASSWORD
                                         DEBUG(100,("smb_pam_passchange_conv: PAM_PROMPT_ECHO_OFF: We actualy sent: %s\n", current_reply));

branches/samba-3.0/source/client/client_proto.h

@@ -93 +93 @@
 NTSTATUS rpccli_net_srv_pwset(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, 
                            const char *machine_name, const uint8 hashed_mach_pwd[16]);
+NTSTATUS rpccli_net_srv_pwset2(struct rpc_pipe_client *cli,
+                               TALLOC_CTX *mem_ctx,
+                               const char *machine_name,
+                               const char *clear_text_mach_pwd);
 
 /* The following definitions come from rpc_client/cli_pipe.c  */
@@ -232 +236 @@
 BOOL net_io_q_srv_pwset(const char *desc, NET_Q_SRV_PWSET *q_s, prs_struct *ps, int depth);
 BOOL net_io_r_srv_pwset(const char *desc, NET_R_SRV_PWSET *r_s, prs_struct *ps, int depth);
+void init_q_srv_pwset2(NET_Q_SRV_PWSET2 *q_s,
+                       const char *logon_srv,
+                       const char *sess_key,
+                       const char *acct_name,
+                       uint16 sec_chan,
+                       const char *comp_name,
+                       DOM_CRED *cred,
+                       const char *clear_text_mach_pwd);
+BOOL net_io_q_srv_pwset2(const char *desc, NET_Q_SRV_PWSET2 *q_s, prs_struct *ps, int depth);
+BOOL net_io_r_srv_pwset2(const char *desc, NET_R_SRV_PWSET2 *r_s, prs_struct *ps, int depth);
 void init_id_info1(NET_ID_INFO_1 *id, const char *domain_name,
                                 uint32 param_ctrl, uint32 log_id_low, uint32 log_id_high,

branches/samba-3.0/source/client/mount.cifs.c

@@ -40 +40 @@
 #include <fcntl.h>
 #include <limits.h>
+#include "mount.h"
 
 #define MOUNT_CIFS_VERSION_MAJOR "1"
-#define MOUNT_CIFS_VERSION_MINOR "10"
+#define MOUNT_CIFS_VERSION_MINOR "12"
 
 #ifndef MOUNT_CIFS_VENDOR_SUFFIX
@@ -65 +66 @@
 #endif
 
+#define MAX_UNC_LEN 1024
+
 #define CONST_DISCARD(type, ptr)      ((type) ((void *) (ptr)))
 
@@ -76 +79 @@
 static int got_uid = 0;
 static int got_gid = 0;
-static int free_share_name = 0;
 static char * user_name = NULL;
 static char * mountpassword = NULL;
@@ -87 +89 @@
 /* like strncpy but does not 0 fill the buffer and always null
  *    terminates. bufsize is the size of the destination buffer */
-size_t strlcpy(char *d, const char *s, size_t bufsize)
+static size_t strlcpy(char *d, const char *s, size_t bufsize)
 {
         size_t len = strlen(s);
@@ -101 +103 @@
  *    terminates. bufsize is the length of the buffer, which should
  *       be one more than the maximum resulting string length */
-size_t strlcat(char *d, const char *s, size_t bufsize)
+static size_t strlcat(char *d, const char *s, size_t bufsize)
 {
         size_t len1 = strlen(d);
@@ -159 +161 @@
                 mountpassword = NULL;
         }
-        exit(1);
+        exit(EX_USAGE);
 }
 
@@ -220 +222 @@
                                                 memset(mountpassword,0,64);
                                         }
-                                        exit(1);
+                                        exit(EX_USAGE);
                                 } else {
                                         got_user = 1;
@@ -246 +248 @@
                                                 memset(mountpassword,0,64);
                                         }
-                                        exit(1);
+                                        exit(EX_USAGE);
                                 } else {
                                         if(mountpassword == NULL) {
@@ -276 +278 @@
                                                 memset(mountpassword,0,64);
                                         }
-                                        exit(1);
+                                        exit(EX_USAGE);
                                 } else {
                                         if(domain_name == NULL) {
@@ -313 +315 @@
         if (mountpassword == NULL) {
                 printf("malloc failed\n");
-                exit(1);
+                exit(EX_SYSERR);
         }
 
@@ -321 +323 @@
                         printf("mount.cifs failed. %s attempting to open password file %s\n",
                                    strerror(errno),filename);
-                        exit(1);
+                        exit(EX_SYSERR);
                 }
         }
@@ -333 +335 @@
                         if(filename != NULL)
                                 close(file_descript);
-                        exit(1);
+                        exit(EX_SYSERR);
                 } else if(rc == 0) {
                         if(mountpassword[0] == 0) {
@@ -477 +479 @@
                 } else if (strncmp(data, "sec", 3) == 0) {
                         if (value) {
-                                if (!strcmp(value, "none"))
+                                if (!strncmp(value, "none", 4) ||
+                                    !strncmp(value, "krb5", 4))
                                         got_password = 1;
                         }
@@ -552 +555 @@
                                         if (!(pw = getpwnam(value))) {
                                                 printf("bad user name \"%s\"\n", value);
-                                                exit(1);
+                                                exit(EX_USAGE);
                                         }
                                         snprintf(user, sizeof(user), "%u", pw->pw_uid);
@@ -568 +571 @@
                                         if (!(gr = getgrnam(value))) {
                                                 printf("bad group name \"%s\"\n", value);
-                                                exit(1);
+                                                exit(EX_USAGE);
                                         }
                                         snprintf(group, sizeof(group), "%u", gr->gr_gid);
@@ -663 +666 @@
                 if (out == NULL) {
                         perror("malloc");
-                        exit(1);
+                        exit(EX_SYSERR);
                 }
 
@@ -688 +691 @@
                 if (out == NULL) {
                         perror("malloc");
-                        exit(1);
+                        exit(EX_SYSERR);
                 }
 
@@ -704 +707 @@
                 if (out == NULL) {
                 perror("malloc");
-                        exit(1);
+                        exit(EX_SYSERR);
                 }
 
@@ -842 +845 @@
 }
 
+/* replace all occurances of "from" in a string with "to" */
+static void replace_char(char *string, char from, char to, int maxlen)
+{
+        char *lastchar = string + maxlen;
+        while (string) {
+                string = strchr(string, from);
+                if (string) {
+                        *string = to;
+                        if (string >= lastchar)
+                                return;
+                }
+        }
+}
+
 /* Note that caller frees the returned buffer if necessary */
 static char * parse_server(char ** punc_name)
 {
         char * unc_name = *punc_name;
-        int length = strnlen(unc_name,1024);
+        int length = strnlen(unc_name, MAX_UNC_LEN);
         char * share;
         char * ipaddress_string = NULL;
@@ -852 +869 @@
         struct in_addr server_ipaddr;
 
-        if(length > 1023) {
+        if(length > (MAX_UNC_LEN - 1)) {
                 printf("mount error: UNC name too long");
                 return NULL;
@@ -871 +888 @@
                         share = strchr(unc_name,':');
                         if(share) {
-                                free_share_name = 1;
                                 *punc_name = (char *)malloc(length+3);
                                 if(*punc_name == NULL) {
@@ -879 +895 @@
                                         return NULL;
                                 }
-                                        
                                 *share = '/';
                                 strncpy((*punc_name)+2,unc_name,length);
+                                free(unc_name);
                                 unc_name = *punc_name;
                                 unc_name[length+2] = 0;
@@ -895 +911 @@
                         unc_name[1] = '/';
                         unc_name += 2;
-                        if ((share = strchr(unc_name, '/')) || 
-                                (share = strchr(unc_name,'\\'))) {
+
+                        /* allow for either delimiter between host and sharename */
+                        if ((share = strpbrk(unc_name, "/\\"))) {
                                 *share = 0;  /* temporarily terminate the string */
                                 share += 1;
@@ -902 +919 @@
                                         host_entry = gethostbyname(unc_name);
                                 }
-                                *(share - 1) = '/'; /* put the slash back */
-                                if ((prefixpath = strchr(share, '/'))) {
+                                *(share - 1) = '/'; /* put delimiter back */
+
+                                /* we don't convert the prefixpath delimiters since '\\' is a valid char in posix paths */
+                                if ((prefixpath = strpbrk(share, "/\\"))) {
                                         *prefixpath = 0;  /* permanently terminate the string */
                                         if (!strlen(++prefixpath))
@@ -968 +987 @@
 };
 
+/* convert a string to uppercase. return false if the string
+ * wasn't ASCII. Return success on a NULL ptr */
+static int
+uppercase_string(char *string)
+{
+        if (!string)
+                return 1;
+
+        while (*string) {
+                /* check for unicode */
+                if ((unsigned char) string[0] & 0x80)
+                        return 0;
+                *string = toupper((unsigned char) *string);
+                string++;
+        }
+
+        return 1;
+}
+
 int main(int argc, char ** argv)
 {
@@ -980 +1018 @@
         char * resolved_path = NULL;
         char * temp;
+        char * dev_name;
         int rc;
         int rsize = 0;
@@ -1003 +1042 @@
         } else {
                 mount_cifs_usage();
-                exit(1);
+                exit(EX_USAGE);
         }
 
@@ -1016 +1055 @@
 #endif */
         if(argc > 2) {
-                share_name = argv[1];
+                dev_name = argv[1];
+                share_name = strndup(argv[1], MAX_UNC_LEN);
+                if (share_name == NULL) {
+                        fprintf(stderr, "%s: %s", argv[0], strerror(ENOMEM));
+                        exit(EX_SYSERR);
+                }
                 mountpoint = argv[2];
+        } else {
+                mount_cifs_usage();
+                exit(EX_USAGE);
         }
 
@@ -1039 +1086 @@
                 case 'h':        /* help */
                         mount_cifs_usage ();
-                        exit(1);
+                        exit(EX_USAGE);
                 case 'n':
                     ++nomtab;
@@ -1096 +1143 @@
                                 if (*ep) {
                                         printf("bad uid value \"%s\"\n", optarg);
-                                        exit(1);
+                                        exit(EX_USAGE);
                                 }
                         } else {
@@ -1103 +1150 @@
                                 if (!(pw = getpwnam(optarg))) {
                                         printf("bad user name \"%s\"\n", optarg);
-                                        exit(1);
+                                        exit(EX_USAGE);
                                 }
                                 uid = pw->pw_uid;
@@ -1116 +1163 @@
                                 if (*ep) {
                                         printf("bad gid value \"%s\"\n", optarg);
-                                        exit(1);
+                                        exit(EX_USAGE);
                                 }
                         } else {
@@ -1123 +1170 @@
                                 if (!(gr = getgrnam(optarg))) {
                                         printf("bad user name \"%s\"\n", optarg);
-                                        exit(1);
+                                        exit(EX_USAGE);
                                 }
                                 gid = gr->gr_gid;
@@ -1153 +1200 @@
                         printf("unknown mount option %c\n",c);
                         mount_cifs_usage();
-                        exit(1);
-                }
-        }
-
-        if((argc < 3) || (share_name == NULL) || (mountpoint == NULL)) {
+                        exit(EX_USAGE);
+                }
+        }
+
+        if((argc < 3) || (dev_name == NULL) || (mountpoint == NULL)) {
                 mount_cifs_usage();
-                exit(1);
+                exit(EX_USAGE);
         }
 
@@ -1176 +1223 @@
 
         if (orgoptions && parse_options(&orgoptions, &flags)) {
-                rc = -1;
+                rc = EX_USAGE;
                 goto mount_exit;
         }
@@ -1182 +1229 @@
         if((ipaddr == NULL) && (got_ip == 0)) {
                 printf("No ip address specified and hostname not found\n");
-                rc = -1;
+                rc = EX_USAGE;
                 goto mount_exit;
         }
@@ -1197 +1244 @@
         if(chdir(mountpoint)) {
                 printf("mount error: can not change directory into mount target %s\n",mountpoint);
-                rc = -1;
+                rc = EX_USAGE;
                 goto mount_exit;
         }
@@ -1203 +1250 @@
         if(stat (".", &statbuf)) {
                 printf("mount error: mount point %s does not exist\n",mountpoint);
-                rc = -1;
+                rc = EX_USAGE;
                 goto mount_exit;
         }
@@ -1209 +1256 @@
         if (S_ISDIR(statbuf.st_mode) == 0) {
                 printf("mount error: mount point %s is not a directory\n",mountpoint);
-                rc = -1;
+                rc = EX_USAGE;
                 goto mount_exit;
         }
@@ -1222 +1269 @@
                 } else {
                         printf("mount error: permission denied or not superuser and mount.cifs not installed SUID\n"); 
-                        return -1;
+                        exit(EX_USAGE);
                 }
         }
@@ -1237 +1284 @@
                 mountpassword = (char *)calloc(65,1);
                 if (!tmp_pass || !mountpassword) {
-                        printf("Password not entered, exiting.\n");
-                        return -1;
+                        printf("Password not entered, exiting\n");
+                        exit(EX_USAGE);
                 }
                 strncpy(mountpassword, tmp_pass, 64);
@@ -1257 +1304 @@
                 printf("No server share name specified\n");
                 printf("\nMounting the DFS root for server not implemented yet\n");
-                exit(1);
+                exit(EX_USAGE);
         }
         if(user_name)
@@ -1274 +1321 @@
         if(options == NULL) {
                 printf("Could not allocate memory for mount options\n");
-                return -1;
+                exit(EX_SYSERR);
         }
 
@@ -1326 +1373 @@
         if(verboseflag)
                 printf("\nmount.cifs kernel mount options %s \n",options);
-        if(mount(share_name, mountpoint, "cifs", flags, options)) {
+
+        /* convert all '\\' to '/' in share portion so that /proc/mounts looks pretty */
+        replace_char(dev_name, '\\', '/', strlen(share_name));
+
+        if(mount(dev_name, mountpoint, "cifs", flags, options)) {
         /* remember to kill daemon on error */
-                char * tmp;
-
                 switch (errno) {
                 case 0:
@@ -1340 +1389 @@
                         if(retry == 0) {
                                 retry = 1;
-                                tmp = share_name;
-                                while (*tmp && !(((unsigned char)tmp[0]) & 0x80)) {
-                                        *tmp = toupper((unsigned char)*tmp);
-                                        tmp++;
-                                }
-                                if(!*tmp) {
+                                if (uppercase_string(dev_name) &&
+                                    uppercase_string(share_name) &&
+                                    uppercase_string(prefixpath)) {
                                         printf("retrying with upper case share name\n");
                                         goto mount_retry;
@@ -1354 +1400 @@
                 }
                 printf("Refer to the mount.cifs(8) manual page (e.g.man mount.cifs)\n");
-                rc = -1;
-                goto mount_exit;
+                rc = EX_FAIL;
         } else {
+                atexit(unlock_mtab);
+                rc = lock_mtab();
+                if (rc) {
+                        printf("cannot lock mtab");
+                        goto mount_exit;
+                }
                 pmntfile = setmntent(MOUNTED, "a+");
-                if(pmntfile) {
-                        mountent.mnt_fsname = share_name;
-                        mountent.mnt_dir = mountpoint; 
-                        mountent.mnt_type = CONST_DISCARD(char *,"cifs"); 
-                        mountent.mnt_opts = (char *)malloc(220);
-                        if(mountent.mnt_opts) {
-                                char * mount_user = getusername();
-                                memset(mountent.mnt_opts,0,200);
-                                if(flags & MS_RDONLY)
-                                        strlcat(mountent.mnt_opts,"ro",220);
-                                else
-                                        strlcat(mountent.mnt_opts,"rw",220);
-                                if(flags & MS_MANDLOCK)
-                                        strlcat(mountent.mnt_opts,",mand",220);
-                                if(flags & MS_NOEXEC)
-                                        strlcat(mountent.mnt_opts,",noexec",220);
-                                if(flags & MS_NOSUID)
-                                        strlcat(mountent.mnt_opts,",nosuid",220);
-                                if(flags & MS_NODEV)
-                                        strlcat(mountent.mnt_opts,",nodev",220);
-                                if(flags & MS_SYNCHRONOUS)
-                                        strlcat(mountent.mnt_opts,",synch",220);
-                                if(mount_user) {
-                                        if(getuid() != 0) {
-                                                strlcat(mountent.mnt_opts,",user=",220);
-                                                strlcat(mountent.mnt_opts,mount_user,220);
-                                        }
-                                        /* free(mount_user); do not free static mem */
-                                }
-                        }
-                        mountent.mnt_freq = 0;
-                        mountent.mnt_passno = 0;
-                        rc = addmntent(pmntfile,&mountent);
-                        endmntent(pmntfile);
-                        if(mountent.mnt_opts) {
-                                free(mountent.mnt_opts);
-                                mountent.mnt_opts = NULL;
-                        }
-                } else {
-                    printf("could not update mount table\n");
-                }
-        }
-        rc = 0;
+                if (!pmntfile) {
+                        printf("could not update mount table\n");
+                        unlock_mtab();
+                        rc = EX_FILEIO;
+                        goto mount_exit;
+                }
+                mountent.mnt_fsname = dev_name;
+                mountent.mnt_dir = mountpoint;
+                mountent.mnt_type = CONST_DISCARD(char *,"cifs");
+                mountent.mnt_opts = (char *)malloc(220);
+                if(mountent.mnt_opts) {
+                        char * mount_user = getusername();
+                        memset(mountent.mnt_opts,0,200);
+                        if(flags & MS_RDONLY)
+                                strlcat(mountent.mnt_opts,"ro",220);
+                        else
+                                strlcat(mountent.mnt_opts,"rw",220);
+                        if(flags & MS_MANDLOCK)
+                                strlcat(mountent.mnt_opts,",mand",220);
+                        if(flags & MS_NOEXEC)
+                                strlcat(mountent.mnt_opts,",noexec",220);
+                        if(flags & MS_NOSUID)
+                                strlcat(mountent.mnt_opts,",nosuid",220);
+                        if(flags & MS_NODEV)
+                                strlcat(mountent.mnt_opts,",nodev",220);
+                        if(flags & MS_SYNCHRONOUS)
+                                strlcat(mountent.mnt_opts,",sync",220);
+                        if(mount_user) {
+                                if(getuid() != 0) {
+                                        strlcat(mountent.mnt_opts,
+                                                ",user=", 220);
+                                        strlcat(mountent.mnt_opts,
+                                                mount_user, 220);
+                                }
+                        }
+                }
+                mountent.mnt_freq = 0;
+                mountent.mnt_passno = 0;
+                rc = addmntent(pmntfile,&mountent);
+                endmntent(pmntfile);
+                unlock_mtab();
+                if(mountent.mnt_opts) {
+                        free(mountent.mnt_opts);
+                        mountent.mnt_opts = NULL;
+                }
+                if (rc)
+                        rc = EX_FILEIO;
+        }
 mount_exit:
         if(mountpassword) {
@@ -1425 +1481 @@
         }
 
-        if(free_share_name) {
-                free(share_name);
-                share_name = NULL;
-                }
-        return rc;
+        free(share_name);
+        exit(rc);
 }

branches/samba-3.0/source/client/umount.cifs.c

@@ -35 +35 @@
 #include <string.h>
 #include <mntent.h>
+#include "mount.h"
 
 #define UNMOUNT_CIFS_VERSION_MAJOR "0"
-#define UNMOUNT_CIFS_VERSION_MINOR "5"
+#define UNMOUNT_CIFS_VERSION_MINOR "6"
 
 #ifndef UNMOUNT_CIFS_VENDOR_SUFFIX
@@ -139 +140 @@
 }
 
-static int lock_mtab(void)
-{
-        int rc;
-        
-        rc = mknod(MOUNTED_LOCK , 0600, 0);
-        if(rc == -1)
-                printf("\ngetting lock file %s failed with %s\n",MOUNTED_LOCK,
-                                strerror(errno));
-                
-        return rc;      
-        
-}
-
-static void unlock_mtab(void)
-{
-        unlink(MOUNTED_LOCK);   
-}
-
 static int remove_from_mtab(char * mountpoint)
 {
@@ -170 +153 @@
         /* Do we first need to check if it is writable? */ 
 
+        atexit(unlock_mtab);
         if (lock_mtab()) {
                 printf("Mount table locked\n");

branches/samba-3.0/source/configure.in

@@ -315 +315 @@
 AC_SUBST(INSTALL_CIFSMOUNT)
 AC_SUBST(UNINSTALL_CIFSMOUNT)
+AC_SUBST(CIFSUPCALL_PROGS)
+AC_SUBST(INSTALL_CIFSUPCALL)
+AC_SUBST(UNINSTALL_CIFSUPCALL)
 AC_SUBST(EXTRA_SBIN_PROGS)
 AC_SUBST(EXTRA_ALL_TARGETS)
@@ -2870 +2873 @@
 # look for a method of setting the effective uid
 seteuid=no;
+
+if test $seteuid = no; then
+AC_CACHE_CHECK([for setreuid],samba_cv_USE_SETREUID,[
+AC_TRY_RUN([
+#define AUTOCONF_TEST 1
+#define USE_SETREUID 1
+#include "confdefs.h"
+#include "${srcdir-.}/lib/util_sec.c"],
+           samba_cv_USE_SETREUID=yes,samba_cv_USE_SETREUID=no,samba_cv_USE_SETREUID=cross)])
+if test x"$samba_cv_USE_SETREUID" = x"yes"; then
+    seteuid=yes;AC_DEFINE(USE_SETREUID,1,[Whether setreuid() is available])
+fi
+fi
+
+# we check for setresuid second as it conflicts with AIO on Linux. 
+# see http://samba.org/~tridge/junkcode/aio_uid.c
 if test $seteuid = no; then
 AC_CACHE_CHECK([for setresuid],samba_cv_USE_SETRESUID,[
@@ -2880 +2899 @@
 if test x"$samba_cv_USE_SETRESUID" = x"yes"; then
     seteuid=yes;AC_DEFINE(USE_SETRESUID,1,[Whether setresuid() is available])
-fi
-fi
-
-
-if test $seteuid = no; then
-AC_CACHE_CHECK([for setreuid],samba_cv_USE_SETREUID,[
-AC_TRY_RUN([
-#define AUTOCONF_TEST 1
-#define USE_SETREUID 1
-#include "confdefs.h"
-#include "${srcdir-.}/lib/util_sec.c"],
-           samba_cv_USE_SETREUID=yes,samba_cv_USE_SETREUID=no,samba_cv_USE_SETREUID=cross)])
-if test x"$samba_cv_USE_SETREUID" = x"yes"; then
-    seteuid=yes;AC_DEFINE(USE_SETREUID,1,[Whether setreuid() is available])
 fi
 fi
@@ -4219 +4224 @@
         INSTALL_CIFSMOUNT="installcifsmount"
         UNINSTALL_CIFSMOUNT="uninstallcifsmount"
+        ;;
+  *)
+        AC_MSG_RESULT(no)
+        ;;
+  esac ]
+)
+
+#################################################
+# check for cifs.upcall support
+AC_CHECK_HEADERS([keyutils.h], [HAVE_KEYUTILS_H=1], [HAVE_KEYUTILS_H=0])
+CIFSUPCALL_PROGS=""
+INSTALL_CIFSUPCALL=""
+UNINSTALL_CIFSUPCALL=""
+AC_MSG_CHECKING(whether to build cifs.upcall)
+AC_ARG_WITH(cifsupcall,
+[  --with-cifsupcall       Include cifs.upcall (Linux only) support (default=yes)],
+[ case "$withval" in
+  no)
+        AC_MSG_RESULT(no)
+        ;;
+  *)
+        case "$host_os" in
+        *linux*)
+                if test x"$use_ads" != x"yes"; then
+                        AC_MSG_ERROR(ADS support should be enabled for building cifs.upcall)
+                elif test x"$HAVE_KEYUTILS_H" != "x1"; then
+                        AC_MSG_ERROR(keyutils package is required for cifs.upcall)
+                else
+                        AC_MSG_RESULT(yes)
+                        AC_DEFINE(WITH_CIFSUPCALL,1,[whether to build cifs.upcall])
+                        CIFSUPCALL_PROGS="bin/cifs.upcall"
+                        INSTALL_CIFSUPCALL="installcifsupcall"
+                        UNINSTALL_CIFSUPCALL="uninstallcifsupcall"
+                fi
+                ;;
+        *)
+                AC_MSG_ERROR(not on a linux system!)
+                ;;
+        esac
+    ;;
+  esac ],
+[ case "$host_os" in
+  *linux*)
+        if test x"$use_ads" != x"yes"; then
+                AC_MSG_WARN(ADS support should be enabled for building cifs.upcall)
+        elif test x"$HAVE_KEYUTILS_H" != "x1"; then
+                AC_MSG_WARN(keyutils package is required for cifs.upcall)
+        else
+                AC_MSG_RESULT(yes)
+                AC_DEFINE(WITH_CIFSUPCALL,1,[whether to build cifs.upcall])
+                CIFSUPCALL_PROGS="bin/cifs.upcall"
+                INSTALL_CIFSUPCALL="installcifsupcall"
+                UNINSTALL_CIFSUPCALL="uninstallcifsupcall"
+        fi
         ;;
   *)

branches/samba-3.0/source/include/ads.h

@@ -57 +57 @@
                 char *client_site_name;
                 time_t current_time;
-                int tried_closest_dc;
         } config;
 } ADS_STRUCT;

branches/samba-3.0/source/include/config.h.in

@@ -716 +716 @@
 #undef HAVE_KERNEL_SHARE_MODES
 
+/* Define to 1 if you have the <keyutils.h> header file. */
+#undef HAVE_KEYUTILS_H
+
 /* Whether to have KRB5 support */
 #undef HAVE_KRB5
@@ -2460 +2463 @@
 /* Whether to build mount.cifs and umount.cifs */
 #undef WITH_CIFSMOUNT
+
+/* whether to build cifs.upcall */
+#undef WITH_CIFSUPCALL
 
 /* Whether to include DFS support */
@@ -2570 +2576 @@
 # undef _POSIX_PTHREAD_SEMANTICS
 #endif
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
 
 /* Whether to build auth_builtin as shared module */

branches/samba-3.0/source/include/rpc_dce.h

@@ -105 +105 @@
 #define NETLOGON_NEG_SCHANNEL                   0x40000000
 
+#define NETLOGON_NEG_PASSWORD_SET2              0x00020000
+
 /* The 7 here seems to be required to get Win2k not to downgrade us
    to NT4.  Actually, anything other than 1ff would seem to do... */

branches/samba-3.0/source/include/rpc_netlogon.h

@@ -43 +43 @@
 #define NET_DSR_GETDCNAMEEX     0x1b
 #define NET_DSR_GETSITENAME     0x1c
+#define NET_SRVPWSET2           0x1e
 #define NET_DSR_GETDCNAMEEX2    0x22
 #define NET_SAMLOGON_EX         0x27
@@ -530 +531 @@
         NTSTATUS status; /* return code */
 } NET_R_SRV_PWSET;
+
+typedef struct net_crypt_password {
+        uint8_t data[512];
+        uint32_t length;
+} NET_CRYPT_PWD;
+
+/* NET_Q_SRV_PWSET2 */
+typedef struct net_q_srv_pwset2_info {
+        DOM_CLNT_INFO clnt_id; /* client identification/authentication info */
+        NET_CRYPT_PWD pwd; /* new password */
+} NET_Q_SRV_PWSET2;
+
+/* NET_R_SRV_PWSET2 */
+typedef struct net_r_srv_pwset2_info {
+        DOM_CRED srv_cred;     /* server-calculated credentials */
+        NTSTATUS status; /* return code */
+} NET_R_SRV_PWSET2;
 
 /* NET_ID_INFO_2 */

branches/samba-3.0/source/include/smb.h

@@ -29 +29 @@
 
 /* logged when starting the various Samba daemons */
-#define COPYRIGHT_STARTUP_MESSAGE       "Copyright Andrew Tridgell and the Samba Team 1992-2008"
+#define COPYRIGHT_STARTUP_MESSAGE       "Copyright Andrew Tridgell and the Samba Team 1992-2009"
 
 
@@ -1564 +1564 @@
 
 /* LDAP SSL options */
-enum ldap_ssl_types {LDAP_SSL_ON, LDAP_SSL_OFF, LDAP_SSL_START_TLS};
+enum ldap_ssl_types {LDAP_SSL_OFF, LDAP_SSL_START_TLS};
 
 /* LDAP PASSWD SYNC methods */

branches/samba-3.0/source/lib/charcnv.c

@@ -1 @@
-/*
+/* 
    Unix SMB/CIFS implementation.
    Character set conversion Extensions
@@ -6 +6 @@
    Copyright (C) Simo Sorce 2001
    Copyright (C) Martin Pool 2003
-
+   
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
-
+   
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-
+   
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -35 +35 @@
  *
  * @brief Character-set conversion routines built on our iconv.
- *
+ * 
  * @note Samba's internal character set (at least in the 3.0 series)
  * is always the same as the one for the Unix filesystem.  It is
@@ -145 +145 @@
                         const char *n2 = charset_name((charset_t)c2);
                         if (conv_handles[c1][c2] &&
-                                strcmp(n1, conv_handles[c1][c2]->from_name) == 0 &&
-                                strcmp(n2, conv_handles[c1][c2]->to_name) == 0)
+                            strcmp(n1, conv_handles[c1][c2]->from_name) == 0 &&
+                            strcmp(n2, conv_handles[c1][c2]->to_name) == 0)
                                 continue;
 
@@ -202 +202 @@
 
 static size_t convert_string_internal(charset_t from, charset_t to,
-                          void const *src, size_t srclen,
-                          void *dest, size_t destlen, BOOL allow_bad_conv)
+                      void const *src, size_t srclen, 
+                      void *dest, size_t destlen, BOOL allow_bad_conv)
 {
         size_t i_len, o_len;
@@ -237 +237 @@
         retval = smb_iconv(descriptor, &inbuf, &i_len, &outbuf, &o_len);
         if(retval==(size_t)-1) {
-                        const char *reason="unknown error";
+                const char *reason="unknown error";
                 switch(errno) {
                         case EINVAL:
@@ -247 +247 @@
                                 break;
                         case E2BIG:
-                                reason="No more room";
+                                reason="No more room"; 
                                 if (!conv_silent) {
                                         if (from == CH_UNIX) {
@@ -278 +278 @@
  use_as_is:
 
-        /*
+        /* 
          * Conversion not supported. This is actually an error, but there are so
          * many misconfigured iconv systems and smb.conf's out there we can't just
@@ -376 +376 @@
 
 size_t convert_string(charset_t from, charset_t to,
-                          void const *src, size_t srclen,
-                          void *dest, size_t destlen, BOOL allow_bad_conv)
+                      void const *src, size_t srclen, 
+                      void *dest, size_t destlen, BOOL allow_bad_conv)
 {
         /*
@@ -518 +518 @@
  *
  * Ensure the srclen contains the terminating zero.
- *
+ * 
  * I hate the goto's in this function. It's embarressing.....
  * There has to be a cleaner way to do this. JRA.
@@ -524 +524 @@
 
 size_t convert_string_allocate(TALLOC_CTX *ctx, charset_t from, charset_t to,
-                                   void const *src, size_t srclen, void *dst, BOOL allow_bad_conv)
+                               void const *src, size_t srclen, void *dst, BOOL allow_bad_conv)
 {
         size_t i_len, o_len, destlen = (srclen * 3) / 2;
@@ -584 +584 @@
                            &inbuf, &i_len,
                            &outbuf, &o_len);
-        if(retval == (size_t)-1)                {
-                        const char *reason="unknown error";
+        if(retval == (size_t)-1)                {
+                const char *reason="unknown error";
                 switch(errno) {
                         case EINVAL:
@@ -595 +595 @@
                                 break;
                         case E2BIG:
-                                goto convert;
+                                goto convert;           
                         case EILSEQ:
                                 reason="Illegal multibyte sequence";
@@ -630 +630 @@
         ob[destlen] = '\0';
         ob[destlen+1] = '\0';
+
         return destlen;
 
  use_as_is:
 
-        /*
+        /* 
          * Conversion not supported. This is actually an error, but there are so
          * many misconfigured iconv systems and smb.conf's out there we can't just
@@ -720 +721 @@
  *
  * @param srclen length of source buffer.
- * @param dest always set at least to NULL
+ * @param dest always set at least to NULL 
  * @note -1 is not accepted for srclen.
  *
@@ -726 +727 @@
  **/
 size_t convert_string_talloc(TALLOC_CTX *ctx, charset_t from, charset_t to,
-                                 void const *src, size_t srclen, void *dst,
-                                 BOOL allow_bad_conv)
+                             void const *src, size_t srclen, void *dst,
+                             BOOL allow_bad_conv)
 {
         void **dest = (void **)dst;
@@ -745 +746 @@
         size_t size;
         smb_ucs2_t *buffer;
-
+        
         size = push_ucs2_allocate(&buffer, src);
         if (size == (size_t)-1) {
@@ -754 +755 @@
                 return srclen;
         }
-
+        
         size = convert_string(CH_UTF16LE, CH_UNIX, buffer, size, dest, destlen, True);
         free(buffer);
@@ -797 +798 @@
 
                 strupper_w(buffer);
-
+        
                 size = convert_string(CH_UTF16LE, CH_UNIX, buffer, -1, out_buffer, sizeof(out_buffer), True);
                 if (size == (size_t)-1) {
@@ -811 +812 @@
         size_t size;
         smb_ucs2_t *buffer = NULL;
-
+        
         size = convert_string_allocate(NULL, CH_UNIX, CH_UTF16LE, src, srclen,
-                                           (void **)(void *)&buffer, True);
+                                       (void **)(void *)&buffer, True);
         if (size == (size_t)-1 || !buffer) {
                 smb_panic("failed to create UCS2 buffer");
@@ -835 +836 @@
         smb_ucs2_t *buffer = NULL;
         char *out_buffer;
-
+        
         size = push_ucs2_allocate(&buffer, s);
         if (size == -1 || !buffer) {
@@ -842 +843 @@
 
         strlower_w(buffer);
-
+        
         size = pull_ucs2_allocate(&out_buffer, buffer);
         SAFE_FREE(buffer);
@@ -849 +850 @@
                 return NULL;
         }
-
+        
         return out_buffer;
 }
@@ -879 +880 @@
         size_t src_len = strlen(src);
         pstring tmpbuf;
-        size_t ret;
-
-        /* No longer allow a length of -1 */
-                if (dest_len == (size_t)-1)
-                smb_panic("push_ascii - dest_len == -1");
+        size_t ret;
+
+        /* No longer allow a length of -1 */
+        if (dest_len == (size_t)-1)
+                smb_panic("push_ascii - dest_len == -1");
 
         if (flags & STR_UPPER) {
@@ -894 +895 @@
                 src_len++;
 
-        ret =convert_string(CH_UNIX, CH_DOS, src, src_len, dest, dest_len, True);
-        if (ret == (size_t)-1 &&
-                        (flags & (STR_TERMINATE | STR_TERMINATE_ASCII))
-                        && dest_len > 0) {
-                ((char *)dest)[0] = '\0';
-        }
-        return ret;
-
+        ret =convert_string(CH_UNIX, CH_DOS, src, src_len, dest, dest_len, True);
+        if (ret == (size_t)-1 &&
+                        (flags & (STR_TERMINATE | STR_TERMINATE_ASCII))
+                        && dest_len > 0) {
+                ((char *)dest)[0] = '\0';
+        }
+        return ret;
 }
 
@@ -1030 +1030 @@
  * <dl>
  * <dt>STR_TERMINATE <dd>means include the null termination.
- * <dt>STR_UPPER         <dd>means uppercase in the destination.
+ * <dt>STR_UPPER     <dd>means uppercase in the destination.
  * <dt>STR_NOALIGN   <dd>means don't do alignment.
  * </dl>
@@ -1094 +1094 @@
  * allocating a buffer using talloc().
  *
- * @param dest always set at least to NULL
+ * @param dest always set at least to NULL 
  *
  * @returns The number of bytes occupied by the string in the destination
- *               or -1 in case of error.
+ *         or -1 in case of error.
  **/
 size_t push_ucs2_talloc(TALLOC_CTX *ctx, smb_ucs2_t **dest, const char *src)
@@ -1111 +1111 @@
  * Copy a string from a unix char* src to a UCS2 destination, allocating a buffer
  *
- * @param dest always set at least to NULL
+ * @param dest always set at least to NULL 
  *
  * @returns The number of bytes occupied by the string in the destination
- *               or -1 in case of error.
+ *         or -1 in case of error.
  **/
 
@@ -1130 +1130 @@
  Flags can have:
   STR_TERMINATE means include the null termination
-  STR_UPPER      means uppercase in the destination
+  STR_UPPER     means uppercase in the destination
  dest_len is the maximum length allowed in the destination. If dest_len
  is -1 then no maxiumum is used.
@@ -1164 +1164 @@
  * Copy a string from a unix char* src to a UTF-8 destination, allocating a buffer using talloc
  *
- * @param dest always set at least to NULL
+ * @param dest always set at least to NULL 
  *
  * @returns The number of bytes occupied by the string in the destination
@@ -1180 +1180 @@
  * Copy a string from a unix char* src to a UTF-8 destination, allocating a buffer
  *
- * @param dest always set at least to NULL
+ * @param dest always set at least to NULL 
  *
  * @returns The number of bytes occupied by the string in the destination
@@ -1190 +1190 @@
 
         *dest = NULL;
-        return convert_string_allocate(NULL, CH_UNIX, CH_UTF8, src, src_len, (void **)dest, True);
+        return convert_string_allocate(NULL, CH_UNIX, CH_UTF8, src, src_len, (void **)dest, True);      
 }
 
@@ -1231 +1231 @@
         if (src_len != (size_t)-1)
                 src_len &= ~1;
-
+        
         ret = convert_string(CH_UTF16LE, CH_UNIX, src, src_len, dest, dest_len, True);
         if (ret == (size_t)-1) {
@@ -1239 +1239 @@
         if (src_len == (size_t)-1)
                 src_len = ret*2;
-
+                
         if (dest_len && ret) {
                 /* Did we already process the terminating zero ? */
@@ -1265 +1265 @@
  * Copy a string from a UCS2 src to a unix char * destination, allocating a buffer using talloc
  *
- * @param dest always set at least to NULL
+ * @param dest always set at least to NULL 
  *
  * @returns The number of bytes occupied by the string in the destination
@@ -1280 +1280 @@
  * Copy a string from a UCS2 src to a unix char * destination, allocating a buffer
  *
- * @param dest always set at least to NULL
+ * @param dest always set at least to NULL 
  *
  * @returns The number of bytes occupied by the string in the destination
@@ -1295 +1295 @@
  * Copy a string from a UTF-8 src to a unix char * destination, allocating a buffer using talloc
  *
- * @param dest always set at least to NULL
+ * @param dest always set at least to NULL 
  *
  * @returns The number of bytes occupied by the string in the destination
@@ -1310 +1310 @@
  * Copy a string from a UTF-8 src to a unix char * destination, allocating a buffer
  *
- * @param dest always set at least to NULL
+ * @param dest always set at least to NULL 
  *
  * @returns The number of bytes occupied by the string in the destination
@@ -1321 +1321 @@
         return convert_string_allocate(NULL, CH_UTF8, CH_UNIX, src, src_len, (void **)dest, True);
 }
-
+ 
 /**
  * Copy a string from a DOS src to a unix char * destination, allocating a buffer using talloc
  *
- * @param dest always set at least to NULL
+ * @param dest always set at least to NULL 
  *
  * @returns The number of bytes occupied by the string in the destination
@@ -1339 +1339 @@
 /**
  Copy a string from a char* src to a unicode or ascii
- dos codepage destination choosing unicode or ascii based on the
+ dos codepage destination choosing unicode or ascii based on the 
  flags in the SMB buffer starting at base_ptr.
  Return the number of bytes occupied by the string in the destination.
  flags can have:
   STR_TERMINATE means include the null termination.
-  STR_UPPER      means uppercase in the destination.
-  STR_ASCII      use ascii even with unicode packet.
+  STR_UPPER     means uppercase in the destination.
+  STR_ASCII     use ascii even with unicode packet.
   STR_NOALIGN   means don't do alignment.
  dest_len is the maximum length allowed in the destination. If dest_len
@@ -1370 +1370 @@
 
         if (!(flags & STR_ASCII) && \
-                ((flags & STR_UNICODE || \
-                  (SVAL(base_ptr, smb_flg2) & FLAGS2_UNICODE_STRINGS)))) {
+            ((flags & STR_UNICODE || \
+              (SVAL(base_ptr, smb_flg2) & FLAGS2_UNICODE_STRINGS)))) {
                 return push_ucs2(base_ptr, dest, src, dest_len, flags);
         }
@@ -1384 +1384 @@
   STR_TERMINATE means the string in src is null terminated.
   STR_UNICODE   means to force as unicode.
-  STR_ASCII      use ascii even with unicode packet.
+  STR_ASCII     use ascii even with unicode packet.
   STR_NOALIGN   means don't do alignment.
  if STR_TERMINATE is set then src_len is ignored is it is -1
@@ -1400 +1400 @@
 
         if (!(flags & STR_ASCII) && \
-                ((flags & STR_UNICODE || \
-                  (SVAL(base_ptr, smb_flg2) & FLAGS2_UNICODE_STRINGS)))) {
+            ((flags & STR_UNICODE || \
+              (SVAL(base_ptr, smb_flg2) & FLAGS2_UNICODE_STRINGS)))) {
                 return pull_ucs2(base_ptr, dest, src, dest_len, src_len, flags);
         }
@@ -1410 +1410 @@
 {
         if (!(flags & STR_ASCII) && \
-                ((flags & STR_UNICODE || \
-                  (SVAL(base_ptr, smb_flg2) & FLAGS2_UNICODE_STRINGS)))) {
+            ((flags & STR_UNICODE || \
+              (SVAL(base_ptr, smb_flg2) & FLAGS2_UNICODE_STRINGS)))) {
                 return ucs2_align(base_ptr, p, flags);
         }
@@ -1434 +1434 @@
 #ifdef __OS2__
         size_t ilen_max;
+        size_t olen_orig;
+        const char *inbuf;
 #endif
         size_t ilen_orig;
         size_t ilen;
-        size_t olen_orig;
         size_t olen;
-        const char *inbuf;
+
         char *outbuf;
 
@@ -1491 +1492 @@
                                 break;
 
+
                         case EINVAL :
 #ifndef __OS2__

branches/samba-3.0/source/lib/debug.c

@@ -693 +693 @@
          *  loop check do a new check as root.
          */
+
         if( geteuid() != 0 )
                 return;
@@ -715 +716 @@
                 }
         }
+
         /*
          * Here's where we need to panic if dbf == NULL..

branches/samba-3.0/source/lib/events.c

@@ -65 +65 @@
         DEBUG(10, ("Destroying timed event %lx \"%s\"\n", (unsigned long)te,
                 te->event_name));
-        DLIST_REMOVE(te->event_ctx->timed_events, te);
+        if (te->event_ctx) {
+                DLIST_REMOVE(te->event_ctx->timed_events, te);
+        }
         return 0;
 }
@@ -135 +137 @@
         struct event_context *event_ctx = fde->event_ctx;
 
-        DLIST_REMOVE(event_ctx->fd_events, fde);
+        if (event_ctx) {
+                DLIST_REMOVE(event_ctx->fd_events, fde);
+        }
         return 0;
 }
@@ -298 +302 @@
 }
 
+static int event_context_destructor(struct event_context *ev)
+{
+        while (ev->fd_events != NULL) {
+                ev->fd_events->event_ctx = NULL;
+                DLIST_REMOVE(ev->fd_events, ev->fd_events);
+        }
+        while (ev->timed_events != NULL) {
+                ev->timed_events->event_ctx = NULL;
+                DLIST_REMOVE(ev->timed_events, ev->timed_events);
+        }
+        return 0;
+}
+
+void event_context_reinit(struct event_context *ev)
+{
+        event_context_destructor(ev);
+        return;
+}
+
 struct event_context *event_context_init(TALLOC_CTX *mem_ctx)
 {
-        return TALLOC_ZERO_P(NULL, struct event_context);
-}
-
-int set_event_dispatch_time(struct event_context *event_ctx,
-                            const char *event_name, struct timeval when)
-{
-        struct timed_event *te;
-
-        for (te = event_ctx->timed_events; te; te = te->next) {
-                if (strcmp(event_name, te->event_name) == 0) {
-                        DLIST_REMOVE(event_ctx->timed_events, te);
-                        te->when = when;
-                        add_event_by_time(te);
-                        return 1;
-                }
-        }
-        return 0;
-}
-
-/* Returns 1 if event was found and cancelled, 0 otherwise. */
-
-int cancel_named_event(struct event_context *event_ctx,
-                       const char *event_name)
-{
-        struct timed_event *te;
-
-        for (te = event_ctx->timed_events; te; te = te->next) {
-                if (strcmp(event_name, te->event_name) == 0) {
-                        TALLOC_FREE(te);
-                        return 1;
-                }
-        }
-        return 0;
-}
+        struct event_context *result;
+
+        result = TALLOC_ZERO_P(mem_ctx, struct event_context);
+        if (result == NULL) {
+                return NULL;
+        }
+
+        talloc_set_destructor(result, event_context_destructor);
+        return result;
+}

branches/samba-3.0/source/lib/genrand.c

@@ -29 +29 @@
 static void (*reseed_callback)(int *newseed);
 
-
 /**************************************************************** 
  Copy any user given reseed data.

branches/samba-3.0/source/lib/iconv.c

@@ -187 +187 @@
         }
 
+
         /* otherwise we have to do it chunks at a time */
         while (*inbytesleft > 0) {

branches/samba-3.0/source/lib/interfaces.c

@@ -83 +83 @@
 #include "interfaces.h"
 
-#ifdef HAVE_IFACE_IFCONF
+#if HAVE_IFACE_IFCONF
 
 /* this works for Linux 2.2, Solaris 2.5, SunOS4, HPUX 10.20, OSF1

branches/samba-3.0/source/lib/messages.c

@@ -128 +128 @@
                        0, TDB_CLEAR_IF_FIRST|TDB_DEFAULT, 
                        O_RDWR|O_CREAT,0600);
+
         if (!tdb) {
                 DEBUG(0,("ERROR: Failed to initialise messages database\n"));

branches/samba-3.0/source/lib/replace/autoconf-2.60.m4

@@ -180 +180 @@
 # Enable extensions on systems that normally disable them,
 # typically due to standards-conformance issues.
+m4_ifndef([AC_USE_SYSTEM_EXTENSIONS],[
 AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS],
 [
@@ -209 +210 @@
   AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
 ])
+])

branches/samba-3.0/source/lib/select.c

@@ -29 +29 @@
    This means all Samba signal handlers should call sys_select_signal().
 */
+
 static pid_t initialised;
 static int select_pipe[2];
@@ -95 +96 @@
         errno = 0;
         ret = select(maxfd,readfds2,writefds,errorfds,tval);
+
         if (ret <= 0) {
                 FD_ZERO(readfds2);

branches/samba-3.0/source/lib/util.c

@@ -1992 +1992 @@
         SMB_STRUCT_FLOCK lock;
         int ret;
+
+        DEBUG(8,("fcntl_lock fd=%d op=%d offset=%.0f count=%.0f type=%d\n",
+                fd,op,(double)offset,(double)count,type));
 
         lock.l_type = type;
@@ -3335 +3338 @@
         return talloc_named_const(context, size, name);
 }
+
+bool reinit_after_fork(struct messaging_context *msg_ctx,
+                       struct event_context *ev_ctx,
+                       bool parent_longlived)
+{
+        set_need_random_reseed();
+        if (tdb_reopen_all(parent_longlived ? 1 : 0) == -1) {
+                DEBUG(0, ("tdb_reopen_all failed.\n"));
+                return false;
+        }
+        event_context_reinit(ev_ctx);
+        return true;
+}

branches/samba-3.0/source/lib/util_sock.c

@@ -155 +155 @@
   {"TCP_KEEPINTVL",     IPPROTO_TCP,   TCP_KEEPINTVL,   0,                 OPT_INT},
 #endif
-#if defined(IPTOS_LOWDELAY) && !defined(TCPV40HDRS)
+#ifdef IPTOS_LOWDELAY
   {"IPTOS_LOWDELAY",    IPPROTO_IP,    IP_TOS,          IPTOS_LOWDELAY,    OPT_ON},
 #endif
-#if defined(IPTOS_THROUGHPUT) && !defined(TCPV40HDRS)
+#ifdef IPTOS_THROUGHPUT
   {"IPTOS_THROUGHPUT",  IPPROTO_IP,    IP_TOS,          IPTOS_THROUGHPUT,  OPT_ON},
 #endif

branches/samba-3.0/source/lib/util_tdb.c

@@ -82 +82 @@
                 tdb_setalarm_sigptr(tdb, NULL);
                 CatchSignal(SIGALRM, SIGNAL_CAST SIG_IGN);
-                if (gotalarm) {
+                if (gotalarm && (ret == -1)) {
                         DEBUG(0,("tdb_chainlock_with_timeout_internal: alarm (%u) timed out for key %s in tdb %s\n",
                                 timeout, key.dptr, tdb_name(tdb)));

branches/samba-3.0/source/libads/ldap.c

@@ -157 +157 @@
         }
 
+        if (ads->config.client_site_name == NULL) {
+                DEBUG(10,("ads_closest_dc: client belongs to no site\n"));
+                return True;
+        }
+
         DEBUG(10,("ads_closest_dc: %s is not the closest DC\n", 
                 ads->config.ldap_server_name));
@@ -244 +249 @@
 static NTSTATUS ads_find_dc(ADS_STRUCT *ads)
 {
+        const char *c_domain;
         const char *c_realm;
         int count, i=0;
         struct ip_service *ip_list;
+        pstring domain;
         pstring realm;
         BOOL got_realm = False;
@@ -278 +285 @@
                                 c_realm = lp_workgroup();
                 }
-                
-                if ( !c_realm || !*c_realm ) {
-                        DEBUG(0,("ads_find_dc: no realm or workgroup!  Don't know what to do\n"));
-                        return NT_STATUS_INVALID_PARAMETER; /* rather need MISSING_PARAMETER ... */
-                }
-        }
-        
+        }
+
+        if ( !c_realm || !*c_realm ) {
+                DEBUG(0,("ads_find_dc: no realm or workgroup!  Don't know what to do\n"));
+                return NT_STATUS_INVALID_PARAMETER; /* rather need MISSING_PARAMETER ... */
+        }
+
+        if ( use_own_domain ) {
+                c_domain = lp_workgroup();
+        } else {
+                c_domain = ads->server.workgroup;
+        }
+
+        pstrcpy( domain, c_domain );
         pstrcpy( realm, c_realm );
 
+        /*
+         * In case of LDAP we use get_dc_name() as that
+         * creates the custom krb5.conf file
+         */
+        if (!(ads->auth.flags & ADS_AUTH_NO_BIND)) {
+                fstring srv_name;
+                struct in_addr ip_out;
+
+                DEBUG(6,("ads_find_dc: (ldap) looking for %s '%s'\n",
+                        (got_realm ? "realm" : "domain"), realm));
+
+                if (get_dc_name(domain, realm, srv_name, &ip_out)) {
+                        /*
+                         * we call ads_try_connect() to fill in the
+                         * ads->config details
+                         */
+                        if (ads_try_connect(ads, srv_name)) {
+                                return NT_STATUS_OK;
+                        }
+                }
+
+                return NT_STATUS_NO_LOGON_SERVERS;
+        }
+
         sitename = sitename_fetch(realm);
 
  again:
 
-        DEBUG(6,("ads_find_dc: looking for %s '%s'\n", 
+        DEBUG(6,("ads_find_dc: (cldap) looking for %s '%s'\n",
                 (got_realm ? "realm" : "domain"), realm));
 
@@ -436 +474 @@
         /* cache the successful connection for workgroup and realm */
         if (ads_closest_dc(ads)) {
-                saf_store( ads->server.workgroup, inet_ntoa(ads->ldap_ip));
-                saf_store( ads->server.realm, inet_ntoa(ads->ldap_ip));
+                saf_store( ads->server.workgroup, ads->config.ldap_server_name);
+                saf_store( ads->server.realm, ads->config.ldap_server_name);
         }
 

branches/samba-3.0/source/libsmb/cliconnect.c

@@ -539 +539 @@
 #define BASE_SESSSETUP_BLOB_PACKET_SIZE (35 + 24 + 22)
 
-static BOOL cli_session_setup_blob(struct cli_state *cli, DATA_BLOB blob, DATA_BLOB session_key_krb5)
+static BOOL cli_session_setup_blob(struct cli_state *cli, DATA_BLOB blob)
 {
         int32 remaining = blob.length;
@@ -563 +563 @@
                         remaining -= max_blob_size;
                 } else {
-                        DATA_BLOB null_blob = data_blob(NULL, 0);
-
                         send_blob.length = remaining; 
                         remaining = 0;
-
-                        /* This is the last packet in the sequence - turn signing on. */
-                        cli_simple_set_signing(cli, session_key_krb5, null_blob); 
                 }
 
@@ -617 +612 @@
         DATA_BLOB negTokenTarg;
         DATA_BLOB session_key_krb5;
+        DATA_BLOB null_blob = data_blob(NULL, 0);
+        NTSTATUS nt_status;
+        BOOL res;
         int rc;
+
+        cli_temp_set_signing(cli);
 
         DEBUG(2,("Doing kerberos session setup\n"));
@@ -634 +634 @@
 #endif
 
-        if (!cli_session_setup_blob(cli, negTokenTarg, session_key_krb5)) {
-                data_blob_free(&negTokenTarg);
-                data_blob_free(&session_key_krb5);
-                return ADS_ERROR_NT(cli_nt_error(cli));
+        if (!cli_session_setup_blob(cli, negTokenTarg)) {
+                nt_status = cli_nt_error(cli);
+                goto nt_error;
+        }
+
+        if (cli_is_error(cli)) {
+                nt_status = cli_nt_error(cli);
+                if (NT_STATUS_IS_OK(nt_status)) {
+                        nt_status = NT_STATUS_UNSUCCESSFUL;
+                }
+                goto nt_error;
         }
 
         cli_set_session_key(cli, session_key_krb5);
+
+        res = cli_simple_set_signing(cli, session_key_krb5, null_blob);
+        if (res) {
+                /* 'resign' the last message, so we get the right sequence numbers
+                   for checking the first reply from the server */
+                cli_calculate_sign_mac(cli);
+
+                if (!cli_check_sign_mac(cli)) {
+                        nt_status = NT_STATUS_ACCESS_DENIED;
+                        goto nt_error;
+                }
+        }
 
         data_blob_free(&negTokenTarg);
         data_blob_free(&session_key_krb5);
 
-        if (cli_is_error(cli)) {
-                if (NT_STATUS_IS_OK(cli_nt_error(cli))) {
-                        return ADS_ERROR_NT(NT_STATUS_UNSUCCESSFUL);
-                }
-        } 
-        return ADS_ERROR_NT(cli_nt_error(cli));
+        return ADS_ERROR_NT(NT_STATUS_OK);
+
+nt_error:
+        data_blob_free(&negTokenTarg);
+        data_blob_free(&session_key_krb5);
+        cli->vuid = 0;
+        return ADS_ERROR_NT(nt_status);
 }
 #endif  /* HAVE_KRB5 */

branches/samba-3.0/source/libsmb/libsmbclient.c

@@ -4527 +4527 @@
          */
         if (ipc_cli && (all || some_nt || all_nt_acls)) {
+                pstring targetpath;
+                struct cli_state *targetcli;
+
                 /* Point to the portion after "system.nt_sec_desc." */
                 name += 19;     /* if (all) this will be invalid but unused */
 
+                if (!cli_resolve_path("", cli, filename,
+                                      &targetcli, targetpath))
+                {
+                        d_printf("Could not resolve %s\n", filename);
+                        return -1;
+                }
+
                 /* ... then obtain any NT attributes which were requested */
-                fnum = cli_nt_create(cli, filename, CREATE_ACCESS_READ);
+                fnum = cli_nt_create(targetcli, targetpath, CREATE_ACCESS_READ);
 
                 if (fnum == -1) {
                         DEBUG(5, ("cacl_get failed to open %s: %s\n",
-                                  filename, cli_errstr(cli)));
+                                  targetpath, cli_errstr(targetcli)));
                         errno = 0;
                         return -1;
                 }
 
-                sd = cli_query_secdesc(cli, fnum, ctx);
+                sd = cli_query_secdesc(targetcli, fnum, ctx);
 
                 if (!sd) {
@@ -4549 +4559 @@
                 }
 
-                cli_close(cli, fnum);
+                cli_close(targetcli, fnum);
 
                 if (! exclude_nt_revision) {
@@ -5149 +5159 @@
         BOOL numeric = True;
 
+        pstring targetpath;
+        struct cli_state *targetcli;
+
         /* the_acl will be null for REMOVE_ALL operations */
         if (the_acl) {
@@ -5178 +5191 @@
         }
 
+        if (!cli_resolve_path("", cli, filename,
+                              &targetcli, targetpath))
+        {
+                d_printf("Could not resolve %s\n", filename);
+                errno = ENOENT;
+                return -1;
+        }
+
         /* The desired access below is the only one I could find that works
            with NT4, W2KP and Samba */
 
-        fnum = cli_nt_create(cli, filename, CREATE_ACCESS_READ);
+        fnum = cli_nt_create(targetcli, targetpath, CREATE_ACCESS_READ);
 
         if (fnum == -1) {
                 DEBUG(5, ("cacl_set failed to open %s: %s\n",
-                          filename, cli_errstr(cli)));
+                          targetpath, cli_errstr(targetcli)));
                 errno = 0;
                 return -1;
         }
 
-        old = cli_query_secdesc(cli, fnum, ctx);
+        old = cli_query_secdesc(targetcli, fnum, ctx);
 
         if (!old) {
@@ -5198 +5219 @@
         }
 
-        cli_close(cli, fnum);
+        cli_close(targetcli, fnum);
 
         switch (mode) {
@@ -5287 +5308 @@
                            owner_sid, group_sid, NULL, dacl, &sd_size);
 
-        fnum = cli_nt_create(cli, filename,
+        fnum = cli_nt_create(targetcli, targetpath,
                              WRITE_DAC_ACCESS | WRITE_OWNER_ACCESS);
 
         if (fnum == -1) {
                 DEBUG(5, ("cacl_set failed to open %s: %s\n",
-                          filename, cli_errstr(cli)));
+                          targetpath, cli_errstr(targetcli)));
                 errno = 0;
                 return -1;
         }
 
-        if (!cli_set_secdesc(cli, fnum, sd)) {
-                DEBUG(5, ("ERROR: secdesc set failed: %s\n", cli_errstr(cli)));
+        if (!cli_set_secdesc(targetcli, fnum, sd)) {
+                DEBUG(5, ("ERROR: secdesc set failed: %s\n", cli_errstr(targetcli)));
                 ret = -1;
         }
@@ -5305 +5326 @@
 
  failed:
-        cli_close(cli, fnum);
+        cli_close(targetcli, fnum);
 
         if (err != 0) {

branches/samba-3.0/source/libsmb/namequery.c

@@ -35 +35 @@
 #define SAFKEY_FMT      "SAF/DOMAIN/%s"
 #define SAF_TTL         900
+#define SAFJOINKEY_FMT  "SAFJOIN/DOMAIN/%s"
+#define SAFJOIN_TTL     3600
 
 static char *saf_key(const char *domain)
@@ -41 +43 @@
         
         asprintf( &keystr, SAFKEY_FMT, strupper_static(domain) );
+
+        return keystr;
+}
+
+static char *saf_join_key(const char *domain)
+{
+        char *keystr;
+
+        asprintf( &keystr, SAFJOINKEY_FMT, strupper_static(domain) );
 
         return keystr;
@@ -68 +79 @@
         
         key = saf_key( domain );
-        expire = time( NULL ) + SAF_TTL;
+        expire = time( NULL ) + lp_parm_int(-1, "saf","ttl", SAF_TTL);
         
         
@@ -81 +92 @@
 }
 
+BOOL saf_join_store( const char *domain, const char *servername )
+{
+        char *key;
+        time_t expire;
+        BOOL ret = False;
+
+        if ( !domain || !servername ) {
+                DEBUG(2,("saf_join_store: Refusing to store empty domain or servername!\n"));
+                return False;
+        }
+
+        if ( (strlen(domain) == 0) || (strlen(servername) == 0) ) {
+                DEBUG(0,("saf_join_store: refusing to store 0 length domain or servername!\n"));
+                return False;
+        }
+
+        if ( !gencache_init() )
+                return False;
+
+        key = saf_join_key( domain );
+        expire = time( NULL ) + lp_parm_int(-1, "saf","join ttl", SAFJOIN_TTL);
+
+        DEBUG(10,("saf_join_store: domain = [%s], server = [%s], expire = [%u]\n",
+                domain, servername, (unsigned int)expire ));
+
+        ret = gencache_set( key, servername, expire );
+
+        SAFE_FREE( key );
+
+        return ret;
+}
+
 BOOL saf_delete( const char *domain )
 {
@@ -94 +137 @@
                 return False;
         
+        key = saf_join_key(domain);
+        ret = gencache_del(key);
+        SAFE_FREE(key);
+
+        if (ret) {
+                DEBUG(10,("saf_delete[join]: domain = [%s]\n", domain ));
+        }
+
         key = saf_key(domain);
         ret = gencache_del(key);
-        
+        SAFE_FREE(key);
+
         if (ret) {
                 DEBUG(10,("saf_delete: domain = [%s]\n", domain ));             
         }
-
-        SAFE_FREE( key );
 
         return ret;
@@ -123 +173 @@
         if ( !gencache_init() ) 
                 return False;
-        
+
+        key = saf_join_key( domain );
+
+        ret = gencache_get( key, &server, &timeout );
+
+        SAFE_FREE( key );
+
+        if ( ret ) {
+                DEBUG(5,("saf_fetch[join]: Returning \"%s\" for \"%s\" domain\n",
+                        server, domain ));
+                return server;
+        }
+
         key = saf_key( domain );
         
@@ -1649 +1711 @@
 
         status = get_dc_list(domain, sitename, ip_list, count, lookup_type, &ordered);
+        if (NT_STATUS_EQUAL(status, NT_STATUS_NO_LOGON_SERVERS) && sitename) {
+                DEBUG(3,("get_sorted_dc_list: no server for name %s available"
+                         " in site %s, fallback to all servers\n",
+                         domain, sitename));
+                status = get_dc_list(domain, NULL, ip_list, count,
+                                     lookup_type, &ordered);
+        }
+
         if (!NT_STATUS_IS_OK(status)) {
                 return status; 

branches/samba-3.0/source/libsmb/trusts_util.c

@@ -33 +33 @@
 static NTSTATUS just_change_the_password(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, 
                                          const unsigned char orig_trust_passwd_hash[16],
+                                         const char *new_trust_pwd_cleartext,
                                          const unsigned char new_trust_passwd_hash[16],
                                          uint32 sec_channel_type)
 {
         NTSTATUS result;
-
-        /* Check if the netlogon pipe is open using schannel. If so we
-           already have valid creds. If not we must set them up. */
-
-        if (cli->auth.auth_type != PIPE_AUTH_TYPE_SCHANNEL) {
-                uint32_t neg_flags = NETLOGON_NEG_AUTH2_ADS_FLAGS;
-
-                result = rpccli_netlogon_setup_creds(cli, 
+        uint32_t neg_flags = NETLOGON_NEG_AUTH2_ADS_FLAGS;
+
+        result = rpccli_netlogon_setup_creds(cli,
                                         cli->cli->desthost, /* server name */
                                         lp_workgroup(), /* domain */
@@ -53 +49 @@
                                         &neg_flags);
 
-                if (!NT_STATUS_IS_OK(result)) {
-                        DEBUG(3,("just_change_the_password: unable to setup creds (%s)!\n",
-                                 nt_errstr(result)));
-                        return result;
-                }
-        }
-
-        result = rpccli_net_srv_pwset(cli, mem_ctx, global_myname(), new_trust_passwd_hash);
+        if (!NT_STATUS_IS_OK(result)) {
+                DEBUG(3,("just_change_the_password: unable to setup creds (%s)!\n",
+                         nt_errstr(result)));
+                return result;
+        }
+
+        if (neg_flags & NETLOGON_NEG_PASSWORD_SET2) {
+                result = rpccli_net_srv_pwset2(cli, mem_ctx, global_myname(),
+                                               new_trust_pwd_cleartext);
+        } else {
+                result = rpccli_net_srv_pwset(cli, mem_ctx, global_myname(),
+                                              new_trust_passwd_hash);
+        }
 
         if (!NT_STATUS_IS_OK(result)) {
@@ -96 +97 @@
 
         nt_status = just_change_the_password(cli, mem_ctx, orig_trust_passwd_hash,
+                                             new_trust_passwd,
                                              new_trust_passwd_hash, sec_channel_type);
         

branches/samba-3.0/source/nsswitch/pam_winbind.c

@@ -1894 +1894 @@
         }
 
+        /*
+         * Delete the krb5 ccname variable from the PAM environment
+         * if it was set by winbind.
+         */
+        if (ctrl & WINBIND_KRB5_AUTH) {
+                pam_putenv(pamh, "KRB5CCNAME");
+        }
+
         _PAM_LOG_FUNCTION_LEAVE("pam_sm_close_session", pamh, ctrl, retval);
         

branches/samba-3.0/source/nsswitch/winbind_nss_solaris.c

@@ -361 +361 @@
         int len = 0;
         struct in_addr *addrp;
+#if defined(AF_INET6)
         struct in6_addr *addrp6;
+#endif
         int i;
 
@@ -393 +395 @@
                 he->h_addr_list = (char **)ROUND_DOWN(addrp, sizeof (char*));
                 he->h_addr_list -= addrcount+1;
-        } else {
+        }
+#if defined(AF_INET6)
+        else {
                 he->h_length = sizeof(struct in6_addr);
                 addrp6 = (struct in6_addr *)ROUND_DOWN(buffer + buflen,
@@ -401 +405 @@
                 he->h_addr_list -= addrcount+1;
         }
+#endif
 
         /* buffer too small?! */
@@ -420 +425 @@
                     return NSS_STR_PARSE_ERANGE;
                   }
-                } else {
+                }
+#if defined(AF_INET6)
+                else {
                   he->h_addr_list[i] = (char *)&addrp6[i];
                   if (strchr(data, ':') != 0) {
@@ -436 +443 @@
                   }
                 }
+#endif
                 data = p+1;
         }
@@ -483 +491 @@
            IPv4 to IPv6.
          */
+#if defined(AF_INET6)
 #ifdef HAVE_NSS_XBYY_KEY_IPNODE
         af = argp->key.ipnode.af_family;
@@ -493 +502 @@
         af = AF_INET6;
 #endif
+#endif
 
         strncpy(request.data.winsreq, argp->key.name, sizeof(request.data.winsreq) - 1);
@@ -541 +551 @@
         ZERO_STRUCT(request);
 
+#if defined(AF_INET6)
         /* winbindd currently does not resolve IPv6 */
         if(argp->key.hostaddr.type == AF_INET6) {
@@ -548 +559 @@
 
         p = inet_ntop(argp->key.hostaddr.type, argp->key.hostaddr.addr,
-                        request.data.winsreq, INET6_ADDRSTRLEN);
+                        request.data.winsreq, sizeof request.data.winsreq);
+#else
+        snprintf(request.data.winsreq, sizeof request.data.winsreq,
+                "%u.%u.%u.%u", 
+                ((unsigned char *)argp->key.hostaddr.addr)[0],
+                ((unsigned char *)argp->key.hostaddr.addr)[1],
+                ((unsigned char *)argp->key.hostaddr.addr)[2],
+                ((unsigned char *)argp->key.hostaddr.addr)[3]);
+#endif
 
         ret = winbindd_request_response(WINBINDD_WINS_BYIP, &request, &response);

branches/samba-3.0/source/nsswitch/winbindd.c

@@ -478 +478 @@
         }
 
-        SAFE_FREE(state->request.extra_data.data);
         SAFE_FREE(state->response.extra_data.data);
 
@@ -513 +512 @@
 static void request_finished(struct winbindd_cli_state *state)
 {
+        /* Make sure request.extra_data is freed when finish processing a request */
+        SAFE_FREE(state->request.extra_data.data);
         setup_async_write(&state->fd_event, &state->response,
                           sizeof(state->response), response_main_sent, state);
@@ -669 +670 @@
 static void remove_client(struct winbindd_cli_state *state)
 {
+        char c = 0;
+
         /* It's a dead client - hold a funeral */
         
@@ -674 +677 @@
                 return;
         }
-                
+
+        /* tell client, we are closing ... */
+        write(state->sock, &c, sizeof(c));
+
         /* Close socket */
                 

branches/samba-3.0/source/nsswitch/winbindd_ads.c

@@ -391 +391 @@
 }
 
+/* convert a single name to a sid in a domain - use rpc methods */
+static NTSTATUS name_to_sid(struct winbindd_domain *domain,
+                            TALLOC_CTX *mem_ctx,
+                            const char *domain_name,
+                            const char *name,
+                            DOM_SID *sid,
+                            enum lsa_SidType *type)
+{
+        return reconnect_methods.name_to_sid(domain, mem_ctx,
+                                             domain_name, name,
+                                             sid, type);
+}
+
+/* convert a domain SID to a user or group name - use rpc methods */
+static NTSTATUS sid_to_name(struct winbindd_domain *domain,
+                            TALLOC_CTX *mem_ctx,
+                            const DOM_SID *sid,
+                            char **domain_name,
+                            char **name,
+                            enum lsa_SidType *type)
+{
+        return reconnect_methods.sid_to_name(domain, mem_ctx, sid,
+                                             domain_name, name, type);
+}
+
+/* convert a list of rids to names - use rpc methods */
+static NTSTATUS rids_to_names(struct winbindd_domain *domain,
+                              TALLOC_CTX *mem_ctx,
+                              const DOM_SID *sid,
+                              uint32 *rids,
+                              size_t num_rids,
+                              char **domain_name,
+                              char ***names,
+                              enum lsa_SidType **types)
+{
+        return reconnect_methods.rids_to_names(domain, mem_ctx, sid,
+                                               rids, num_rids,
+                                               domain_name, names, types);
+}
+
 /* convert a DN to a name, SID and name type 
    this might become a major speed bottleneck if groups have
@@ -830 +870 @@
         ads_msgfree(ads, msg);
         return status;
+}
+
+/* Lookup aliases a user is member of - use rpc methods */
+static NTSTATUS lookup_useraliases(struct winbindd_domain *domain,
+                                   TALLOC_CTX *mem_ctx,
+                                   uint32 num_sids, const DOM_SID *sids,
+                                   uint32 *num_aliases, uint32 **alias_rids)
+{
+        return reconnect_methods.lookup_useraliases(domain, mem_ctx,
+                                                    num_sids, sids,
+                                                    num_aliases,
+                                                    alias_rids);
 }
 
@@ -1036 +1088 @@
 }
 
+/* find the lockout policy of a domain - use rpc methods */
+static NTSTATUS lockout_policy(struct winbindd_domain *domain,
+                               TALLOC_CTX *mem_ctx,
+                               SAM_UNK_INFO_12 *policy)
+{
+        return reconnect_methods.lockout_policy(domain, mem_ctx, policy);
+}
+
+/* find the password policy of a domain - use rpc methods */
+static NTSTATUS password_policy(struct winbindd_domain *domain,
+                                TALLOC_CTX *mem_ctx,
+                                SAM_UNK_INFO_1 *policy)
+{
+        return reconnect_methods.password_policy(domain, mem_ctx, policy);
+}
+
 /* get a list of trusted domains */
 static NTSTATUS trusted_domains(struct winbindd_domain *domain,
@@ -1114 +1182 @@
         enum_dom_groups,
         enum_local_groups,
-        msrpc_name_to_sid,
-        msrpc_sid_to_name,
-        msrpc_rids_to_names,
+        name_to_sid,
+        sid_to_name,
+        rids_to_names,
         query_user,
         lookup_usergroups,
-        msrpc_lookup_useraliases,
+        lookup_useraliases,
         lookup_groupmem,
         sequence_number,
-        msrpc_lockout_policy,
-        msrpc_password_policy,
+        lockout_policy,
+        password_policy,
         trusted_domains,
 };

branches/samba-3.0/source/nsswitch/winbindd_cm.c

@@ -162 +162 @@
 ****************************************************************/
 
+bool winbindd_reinit_after_fork(const char *logfile);
+
 static BOOL fork_child_dc_connect(struct winbindd_domain *domain)
 {
@@ -169 +171 @@
         pid_t child_pid;
         pid_t parent_pid = sys_getpid();
+        pstring logfile;
 
         /* Stop zombies */
@@ -198 +201 @@
 
         /* tdb needs special fork handling */
-        if (tdb_reopen_all(1) == -1) {
-                DEBUG(0,("tdb_reopen_all failed.\n"));
+        if (!override_logfile) {
+                pstr_sprintf(logfile, "%s/log.winbindd-dc-connect", dyn_LOGFILEBASE);
+        }
+        if (!winbindd_reinit_after_fork(logfile)) {
+                DEBUG(0,("winbindd_reinit_after_fork failed.\n"));
+                message_send_pid(pid_to_procid(parent_pid), MSG_WINBIND_FAILED_TO_GO_ONLINE,
+                                domain->name,
+                                strlen(domain->name)+1, False);
                 _exit(0);
-        }
-
-        close_conns_after_fork();
-
-        if (!override_logfile) {
-                pstring logfile;
-                pstr_sprintf(logfile, "%s/log.winbindd-dc-connect", dyn_LOGFILEBASE);
-                lp_set_logfile(logfile);
-                reopen_logs();
         }
 
@@ -352 +352 @@
 ****************************************************************/
 
+void ccache_regain_all_now(void);
+
 static void set_domain_online(struct winbindd_domain *domain)
 {
-        struct timeval now;
-
         DEBUG(10,("set_domain_online: called for domain %s\n",
                 domain->name ));
@@ -372 +372 @@
 
         /* If we are waiting to get a krb5 ticket, trigger immediately. */
-        GetTimeOfDay(&now);
-        set_event_dispatch_time(winbind_event_context(),
-                                "krb5_ticket_gain_handler", now);
+        ccache_regain_all_now();
 
         /* Ok, we're out of any startup mode now... */
@@ -427 +425 @@
            because network manager seems to lie.
            Wait at least 5 seconds. Heuristics suck... */
+        GetTimeOfDay(&tev);
+
+        /* Go into "startup" mode again. */
+        domain->startup_time = tev.tv_sec;
+        domain->startup = True;
+
+        tev.tv_sec += 5;
 
         if (!domain->check_online_event) {
@@ -437 +442 @@
                         domain->name ));
 
-                domain->check_online_event = event_add_timed(winbind_event_context(),
-                                                                NULL,
-                                                                timeval_current_ofs(5, 0),
-                                                                "check_domain_online_handler",
-                                                                check_domain_online_handler,
-                                                                domain);
-
-                /* The above *has* to succeed for winbindd to work. */
-                if (!domain->check_online_event) {
-                        smb_panic("set_domain_online_request: failed to add online handler.\n");
-                }
-        }
-
-        GetTimeOfDay(&tev);
-
-        /* Go into "startup" mode again. */
-        domain->startup_time = tev.tv_sec;
-        domain->startup = True;
-
-        tev.tv_sec += 5;
-
-        set_event_dispatch_time(winbind_event_context(), "check_domain_online_handler", tev);
+        }
+        TALLOC_FREE(domain->check_online_event);
+        
+        domain->check_online_event = event_add_timed(winbind_event_context(),
+                                                        NULL,
+                                                        tev,
+                                                        "check_domain_online_handler",
+                                                        check_domain_online_handler,
+                                                        domain);
+
+        /* The above *has* to succeed for winbindd to work. */
+        if (!domain->check_online_event) {
+                smb_panic("set_domain_online_request: failed to add online handler.\n");
+        }
 }
 

branches/samba-3.0/source/nsswitch/winbindd_cred_cache.c

@@ -36 +36 @@
 
 static struct WINBINDD_CCACHE_ENTRY *ccache_list;
+static void add_krb5_ticket_gain_handler_event(struct WINBINDD_CCACHE_ENTRY *entry,
+                                                struct timeval t);
 
 /* The Krb5 ticket refresh handler should be scheduled 
@@ -71 +73 @@
         }
         return i;
+}
+
+void ccache_remove_all_after_fork(void)
+{
+        struct WINBINDD_CCACHE_ENTRY *cur;
+        cur = ccache_list;
+        while (cur) {
+                DLIST_REMOVE(ccache_list, cur);
+                TALLOC_FREE(cur->event);
+                TALLOC_FREE(cur);
+                cur = ccache_list;
+        }
+}
+
+static void krb5_ticket_gain_handler(struct event_context *event_ctx,
+                                     struct timed_event *te,
+                                     const struct timeval *now,
+                                     void *private_data);
+static void krb5_ticket_refresh_handler(struct event_context *event_ctx,
+                                        struct timed_event *te,
+                                        const struct timeval *now,
+                                        void *private_data);
+
+void ccache_regain_all_now(void)
+{
+        struct WINBINDD_CCACHE_ENTRY *cur;
+        struct timeval t = timeval_current();
+
+        for (cur = ccache_list; cur; cur = cur->next) {
+                struct timed_event *new_event;
+
+                /*
+                 * if refresh_time is 0, we know that the
+                 * the event has the krb5_ticket_gain_handler
+                 */
+                if (cur->refresh_time == 0) {
+                        new_event = event_add_timed(winbind_event_context(),
+                                                cur, t,
+                                                "krb5_ticket_gain_handler",
+                                                krb5_ticket_gain_handler,
+                                                cur);
+                } else {
+                        new_event = event_add_timed(winbind_event_context(),
+                                                cur, t,
+                                                "krb5_ticket_refresh_handler",
+                                                krb5_ticket_refresh_handler,
+                                                cur);
+                }
+                if (!new_event) {
+                        continue;
+                }
+
+                TALLOC_FREE(cur->event);
+                cur->event = new_event;
+        }
+        return;
+}
+
+/****************************************************************
+ The gain initial ticket is recognized as entry->refresh_time is
+ always zero.
+****************************************************************/
+
+static void add_krb5_ticket_gain_handler_event(struct WINBINDD_CCACHE_ENTRY *entry,
+                                                struct timeval t)
+{
+        entry->refresh_time = 0;
+        entry->event = event_add_timed(winbind_event_context(), entry,
+                                        t,
+                                        "krb5_ticket_gain_handler",
+                                        krb5_ticket_gain_handler,
+                                        entry);
 }
 
@@ -87 +161 @@
         int ret;
         time_t new_start;
+        time_t expire_time = 0;
         struct WINBINDD_MEMORY_CREDS *cred_ptr = entry->cred_ptr;
 #endif
@@ -98 +173 @@
 
         /* Kinit again if we have the user password and we can't renew the old
-         * tgt anymore */
-
-        if ((entry->renew_until < time(NULL)) && cred_ptr && cred_ptr->pass) {
-             
-                set_effective_uid(entry->uid);
-
-                ret = kerberos_kinit_password_ext(entry->principal_name,
-                                                  cred_ptr->pass,
-                                                  0, /* hm, can we do time correction here ? */
-                                                  &entry->refresh_time,
-                                                  &entry->renew_until,
-                                                  entry->ccname,
-                                                  False, /* no PAC required anymore */
-                                                  True,
-                                                  WINBINDD_PAM_AUTH_KRB5_RENEW_TIME);
-                gain_root_privilege();
-
-                if (ret) {
-                        DEBUG(3,("krb5_ticket_refresh_handler: could not re-kinit: %s\n",
-                                error_message(ret)));
-                        TALLOC_FREE(entry->event);
-                        return;
-                }
-
-                DEBUG(10,("krb5_ticket_refresh_handler: successful re-kinit "
-                        "for: %s in ccache: %s\n", 
-                        entry->principal_name, entry->ccname));
-
+         * tgt anymore
+         * NB
+         * This happens when machine are put to sleep for a very long time. */
+
+        if (entry->renew_until < time(NULL)) {
+rekinit:
+                if (cred_ptr && cred_ptr->pass) {
+
+                        set_effective_uid(entry->uid);
+
+                        ret = kerberos_kinit_password_ext(entry->principal_name,
+                                                          cred_ptr->pass,
+                                                          0, /* hm, can we do time correction here ? */
+                                                          &entry->refresh_time,
+                                                          &entry->renew_until,
+                                                          entry->ccname,
+                                                          False, /* no PAC required anymore */
+                                                          True,
+                                                          WINBINDD_PAM_AUTH_KRB5_RENEW_TIME);
+                        gain_root_privilege();
+
+                        if (ret) {
+                                DEBUG(3,("krb5_ticket_refresh_handler: "
+                                        "could not re-kinit: %s\n",
+                                        error_message(ret)));
+                                /* destroy the ticket because we cannot rekinit
+                                 * it, ignore error here */
+                                ads_kdestroy(entry->ccname);
+
+                                /* Don't break the ticket refresh chain: retry 
+                                 * refreshing ticket sometime later when KDC is 
+                                 * unreachable -- BoYang.
+                                 * More error handling here? KRB5_CC_IO, 
+                                 * KRB5KRB_AP_ERR_SKEW.
+                                 * */
+
+                                if ((ret == KRB5_KDC_UNREACH)
+                                    || (ret == KRB5_REALM_CANT_RESOLVE)) {
 #if defined(DEBUG_KRB5_TKT_RENEWAL)
-                new_start = time(NULL) + 30;            
-#else
-                /* The tkt should be refreshed at one-half the period
-                   from now to the expiration time */
-                new_start = KRB5_EVENT_REFRESH_TIME(entry->refresh_time);
-#endif
-
-                goto done;
-        }
+                                        new_start = time(NULL) + 30;
+#else
+                                        new_start = time(NULL) +
+                                                    MAX(30, lp_winbind_cache_time());
+#endif
+                                        /* try to regain ticket here */
+                                        add_krb5_ticket_gain_handler_event(entry,
+                                                                        timeval_set(new_start, 0));
+                                        return;
+                                }
+                                TALLOC_FREE(entry->event);
+                                return;
+                        }
+
+                        DEBUG(10,("krb5_ticket_refresh_handler: successful re-kinit "
+                                "for: %s in ccache: %s\n",
+                                entry->principal_name, entry->ccname));
+  
+#if defined(DEBUG_KRB5_TKT_RENEWAL)
+                        new_start = time(NULL) + 30;
+#else
+                        /* The tkt should be refreshed at one-half the period
+                           from now to the expiration time */
+                        expire_time = entry->refresh_time;
+                        new_start = KRB5_EVENT_REFRESH_TIME(entry->refresh_time);
+#endif
+                        goto done;
+                } else {
+                                /* can this happen? 
+                                 * No cached credentials
+                                 * destroy ticket and refresh chain 
+                                 * */
+                                ads_kdestroy(entry->ccname);
+                                TALLOC_FREE(entry->event);
+                                return;
+                }
+        }
 
         set_effective_uid(entry->uid);
@@ -146 +259 @@
         new_start = time(NULL) + 30;
 #else
+        expire_time = new_start;
         new_start = KRB5_EVENT_REFRESH_TIME(new_start);
 #endif
@@ -156 +270 @@
                 /* maybe we are beyond the renewing window */
 
+                /* evil rises here, we refresh ticket failed,
+                 * but the ticket might be expired. Therefore,
+                 * When we refresh ticket failed, destory the 
+                 * ticket */
+ 
+                ads_kdestroy(entry->ccname);
+ 
                 /* avoid breaking the renewal chain: retry in lp_winbind_cache_time()
-                 * seconds when the KDC was not available right now. */
-
-                if (ret == KRB5_KDC_UNREACH) {
-                        new_start = time(NULL) + MAX(30, lp_winbind_cache_time());
-                        goto done;
-                }
+                 * seconds when the KDC was not available right now.
+                 * the return code can be KRB5_REALM_CANT_RESOLVE
+                 * More error handling here? KRB5_CC_IO, KRB5KRB_AP_ERR_SKEW. */
+  
+                if ((ret == KRB5_KDC_UNREACH) 
+                    || (ret == KRB5_REALM_CANT_RESOLVE)) {
+#if defined(DEBUG_KRB5_TKT_RENEWAL)
+                        new_start = time(NULL) + 30;
+#else
+                        new_start = time(NULL) +
+                                    MAX(30, lp_winbind_cache_time());
+#endif
+                        /* ticket is destroyed here, we have to regain it
+                         * if it is possible */
+                        add_krb5_ticket_gain_handler_event(entry, timeval_set(new_start, 0));
+                        return;
+                }
+                /* This is evil, if the ticket was already expired.
+                 * renew ticket function returns KRB5KRB_AP_ERR_TKT_EXPIRED.
+                 * But there is still a chance that we can rekinit it. 
+                 *
+                 * This happens when user login in online mode, and then network
+                 * down or something cause winbind goes offline for a very long time,
+                 * and then goes online again. ticket expired, renew failed.
+                 * This happens when machine are put to sleep for a long time,
+                 * but shorter than entry->renew_util.
+                 * NB
+                 * Looks like the KDC is reachable, we want to rekinit as soon as
+                 * possible instead of waiting some time later. */
+                if ((ret == KRB5KRB_AP_ERR_TKT_EXPIRED)
+                    || (ret == KRB5_FCC_NOFILE)) goto rekinit;
+ 
 
                 return;
@@ -168 +315 @@
 
 done:
-
+        /* in cases that ticket will be unrenewable soon, we don't try to renew ticket 
+         * but try to regain ticket if it is possible */
+        if (entry->renew_until && expire_time
+             && (entry->renew_until <= expire_time)) {
+                /* try to regain ticket 10 seconds beforre expiration */
+                expire_time -= 10;
+                add_krb5_ticket_gain_handler_event(entry, timeval_set(expire_time, 0));
+                return;
+        }
+        
+        if (!entry->refresh_time) {
+                entry->refresh_time = new_start;
+        }
         entry->event = event_add_timed(winbind_event_context(), entry, 
                                        timeval_set(new_start, 0),
@@ -231 +390 @@
                         DEBUG(3,("krb5_ticket_gain_handler: could not kinit: %s\n",
                                 error_message(ret)));
+                        /* evil. If we cannot do it, destroy any the __maybe__ 
+                         * __existing__ ticket */
+                        ads_kdestroy(entry->ccname);
                         goto retry_later;
                 }
@@ -241 +403 @@
 
   retry_later:
-
-        entry->event = event_add_timed(winbind_event_context(), entry,
-                                        timeval_current_ofs(MAX(30, lp_winbind_cache_time()), 0),
-                                        "krb5_ticket_gain_handler",
-                                        krb5_ticket_gain_handler,
-                                        entry);
+#if defined(DEBUG_KRB5_TKT_REGAIN)
+        t = timeval_set(time(NULL) + 30, 0);
+#else
+        t = timeval_current_ofs(MAX(30, lp_winbind_cache_time()), 0);
+#endif
+        add_krb5_ticket_gain_handler_event(entry, t);
 
         return;
@@ -257 +419 @@
         t = timeval_set(KRB5_EVENT_REFRESH_TIME(entry->refresh_time), 0);
 #endif
-
+        
+        if (!entry->refresh_time) {
+                entry->refresh_time = t.tv_sec;
+        }
         entry->event = event_add_timed(winbind_event_context(), entry,
                                         t,
@@ -315 +480 @@
 {
         struct WINBINDD_CCACHE_ENTRY *entry = NULL;
+        NTSTATUS ntret;
+#ifdef HAVE_KRB5
+        int ret;
+#endif
 
         if ((username == NULL && princ_name == NULL) || ccname == NULL || uid < 0) {
@@ -324 +493 @@
                 return NT_STATUS_NO_MORE_ENTRIES;
         }
+
+        /* If it is cached login, destroy krb5 ticket
+         * to avoid surprise. */
+#ifdef HAVE_KRB5
+        if (postponed_request) {
+                /* ignore KRB5_FCC_NOFILE error here */
+                ret = ads_kdestroy(ccname);
+                if (ret == KRB5_FCC_NOFILE) {
+                        ret = 0;
+                }
+                if (ret) {
+                        DEBUG(0, ("add_ccache_to_list: failed to destroy "
+                                   "user krb5 ccache %s with %s\n", ccname,
+                                   error_message(ret)));
+                        return krb5_to_nt_status(ret);
+                } else {
+                        DEBUG(10, ("add_ccache_to_list: successfully destroyed "
+                                   "krb5 ccache %s for user %s\n", ccname,
+                                   username));
+                }
+        }
+#endif
 
         /* Reference count old entries */
@@ -336 +527 @@
                         username, entry->ref_count));
                 /* FIXME: in this case we still might want to have a krb5 cred
-                 * event handler created - gd*/
+                 * event handler created - gd
+                 * Add ticket refresh handler here */
+                
+                if (!lp_winbind_refresh_tickets() || renew_until <= 0) {
+                        return NT_STATUS_OK;
+                }
+                
+                if (!entry->event) {
+                        struct timeval t;
+                        if (postponed_request) {
+                                t = timeval_current_ofs(MAX(30, lp_winbind_cache_time()), 0);
+                                add_krb5_ticket_gain_handler_event(entry, t);
+                        } else {
+                                /* Renew at 1/2 the ticket expiration time */
+#if defined(DEBUG_KRB5_TKT_RENEWAL)
+                                t = timeval_set(time(NULL)+30, 0);
+#else
+                                t = timeval_set(KRB5_EVENT_REFRESH_TIME(ticket_end), 0);
+#endif
+                                if (!entry->refresh_time) {
+                                        entry->refresh_time = t.tv_sec;
+                                }
+                                entry->event = event_add_timed(winbind_event_context(),
+                                                               entry,
+                                                               t,
+                                                               "krb5_ticket_refresh_handler",
+                                                               krb5_ticket_refresh_handler,
+                                                               entry);
+                        }
+
+                        if (!entry->event) {
+                                ntret = remove_ccache(username);
+                                if (!NT_STATUS_IS_OK(ntret)) {
+                                        DEBUG(0, ("add_ccache_to_list: Failed to remove krb5 "
+                                                  "ccache %s for user %s\n", entry->ccname,
+                                                  entry->username));
+                                        DEBUG(0, ("add_ccache_to_list: error is %s\n",
+                                                  nt_errstr(ntret)));
+                                        return ntret;
+                                }
+                                return NT_STATUS_NO_MEMORY;
+                        }
+
+                        DEBUG(10,("add_ccache_to_list: added krb5_ticket handler\n"));
+                }
+                 
                 return NT_STATUS_OK;
         }
@@ -382 +618 @@
 
         if (lp_winbind_refresh_tickets() && renew_until > 0) {
+                struct timeval t;
                 if (postponed_request) {
-                        entry->event = event_add_timed(winbind_event_context(), entry,
-                                                timeval_current_ofs(MAX(30, lp_winbind_cache_time()), 0),
-                                                "krb5_ticket_gain_handler",
-                                                krb5_ticket_gain_handler,
-                                                entry);
+                        add_krb5_ticket_gain_handler_event(entry, t);
                 } else {
                         /* Renew at 1/2 the ticket expiration time */
+#if defined(DEBUG_KRB5_TKT_RENEWAL)
+                        t = timeval_set(time(NULL)+30, 0);
+#else
+                        t = timeval_set(KRB5_EVENT_REFRESH_TIME(ticket_end), 0);
+#endif
+                        if (!entry->refresh_time) {
+                                entry->refresh_time = t.tv_sec;
+                        }
                         entry->event = event_add_timed(winbind_event_context(), entry,
-#if defined(DEBUG_KRB5_TKT_RENEWAL)
-                                                timeval_set(time(NULL)+30, 0),
-#else
-                                                timeval_set(KRB5_EVENT_REFRESH_TIME(ticket_end), 0),
-#endif
+                                                t,
                                                 "krb5_ticket_refresh_handler",
                                                 krb5_ticket_refresh_handler,

branches/samba-3.0/source/nsswitch/winbindd_dual.c

@@ -195 +195 @@
         TALLOC_FREE(state->reply_timeout_event);
 
-        SMB_ASSERT(state->child_pid != (pid_t)0);
-
-        /* If not already reaped, send kill signal to child. */
-        if (state->child->pid == state->child_pid) {
+        /* If child exists and is not already reaped,
+           send kill signal to child. */
+
+        if ((state->child->pid != (pid_t)0) &&
+                        (state->child->pid != (pid_t)-1) &&
+                        (state->child->pid == state->child_pid)) {
                 kill(state->child_pid, SIGTERM);
 
@@ -293 +295 @@
         }
 
+        /*
+         * This may be a reschedule, so we might
+         * have an existing timeout event pending on
+         * the first entry in the child->requests list
+         * (we only send one request at a time).
+         * Ensure we free it before we reschedule.
+         * Bug #5814, from hargagan <shargagan@novell.com>.
+         * JRA.
+         */
+
+        TALLOC_FREE(request->reply_timeout_event);
+
         if ((child->pid == 0) && (!fork_domain_child(child))) {
-                /* Cancel all outstanding requests */
+                /* fork_domain_child failed.
+                   Cancel all outstanding requests */
 
                 while (request != NULL) {
                         /* request might be free'd in the continuation */
                         struct winbindd_async_request *next = request->next;
-                        request->continuation(request->private_data, False);
+
+                        async_request_fail(request);
                         request = next;
                 }
@@ -536 +552 @@
         child->pid = 0;
 
+        if (child->requests) {
+                /*
+                 * schedule_async_request() will also
+                 * clear this event but the call is
+                 * idempotent so it doesn't hurt to
+                 * cover all possible future code
+                 * paths. JRA.
+                 */
+                TALLOC_FREE(child->requests->reply_timeout_event);
+        }
+
         schedule_async_request(child);
 }
@@ -753 +780 @@
 {
         struct winbindd_domain *domain;
+        struct winbindd_domain *primary_domain = NULL;
         const char *domainname = (const char *)buf;
 
@@ -772 +800 @@
         }
 
+        primary_domain = find_our_domain();
+
         /* Mark the requested domain offline. */
 
@@ -781 +811 @@
                         DEBUG(5,("child_msg_offline: marking %s offline.\n", domain->name));
                         set_domain_offline(domain);
+                        /* we are in the trusted domain, set the primary domain 
+                         * offline too */
+                        if (domain != primary_domain) {
+                                set_domain_offline(primary_domain);
+                        }
                 }
         }
@@ -791 +826 @@
 {
         struct winbindd_domain *domain;
+        struct winbindd_domain *primary_domain = NULL;
         const char *domainname = (const char *)buf;
 
@@ -803 +839 @@
                 return;
         }
+
+        primary_domain = find_our_domain();
 
         /* Set our global state as online. */
@@ -818 +856 @@
                         winbindd_flush_negative_conn_cache(domain);
                         set_domain_online_request(domain);
+
+                        /* we can be in trusted domain, which will contact primary domain
+                         * we have to bring primary domain online in trusted domain process
+                         * see, winbindd_dual_pam_auth() --> winbindd_dual_pam_auth_samlogon()
+                         * --> contact_domain = find_our_domain()
+                         * */
+                        if (domain != primary_domain) {
+                                winbindd_flush_negative_conn_cache(primary_domain);
+                                set_domain_online_request(primary_domain);
+                        }
                 }
         }
@@ -881 +929 @@
 }
 
+bool reinit_after_fork(struct messaging_context *msg_ctx,
+                        struct event_context *ev_ctx,
+                        bool parent_longlived);
+void ccache_remove_all_after_fork(void);
+
+bool winbindd_reinit_after_fork(const char *logfile)
+{
+        struct winbindd_domain *dom;
+        struct winbindd_child *cl;
+
+        if (!reinit_after_fork(NULL,
+                                winbind_event_context(), true)) {
+                DEBUG(0, ("reinit_after_fork failed.\n"));
+                return false;
+        }
+
+        close_conns_after_fork();
+
+        if (!override_logfile && logfile) {
+                lp_set_logfile(logfile);
+                reopen_logs();
+        }
+
+        /* Don't handle the same messages as our parent. */
+        message_deregister(MSG_SMB_CONF_UPDATED);
+        message_deregister(MSG_SHUTDOWN);
+        message_deregister(MSG_WINBIND_OFFLINE);
+        message_deregister(MSG_WINBIND_ONLINE);
+        message_deregister(MSG_WINBIND_ONLINESTATUS);
+
+        ccache_remove_all_after_fork();
+        
+        for (dom = domain_list(); dom; dom = dom->next) {
+                TALLOC_FREE(dom->check_online_event);
+        }
+
+        for (cl = children; cl; cl = cl->next) {
+                struct winbindd_async_request *request;
+
+                for (request = cl->requests; request; request = request->next) {
+                        TALLOC_FREE(request->reply_timeout_event);
+                }
+                TALLOC_FREE(cl->lockout_policy_event);
+        }
+
+        return true;
+}
+
 static BOOL fork_domain_child(struct winbindd_child *child)
 {
         int fdpair[2];
         struct winbindd_cli_state state;
-        struct winbindd_domain *domain;
         struct winbindd_domain *primary_domain = NULL;
 
@@ -916 +1011 @@
                 child->event.fd = fdpair[1];
                 child->event.flags = 0;
-                child->requests = NULL;
                 add_fd_event(&child->event);
                 /* We're ok with online/offline messages now. */
@@ -932 +1026 @@
 
         /* tdb needs special fork handling */
-        if (tdb_reopen_all(1) == -1) {
-                DEBUG(0,("tdb_reopen_all failed.\n"));
+        if (!winbindd_reinit_after_fork(child->logfilename)) {
+                DEBUG(0, ("winbindd_reinit_after_fork failed.\n"));
                 _exit(0);
         }
-
-        close_conns_after_fork();
-
-        if (!override_logfile) {
-                lp_set_logfile(child->logfilename);
-                reopen_logs();
-        }
-
-        /* Don't handle the same messages as our parent. */
-        message_deregister(MSG_SMB_CONF_UPDATED);
-        message_deregister(MSG_SHUTDOWN);
-        message_deregister(MSG_WINBIND_OFFLINE);
-        message_deregister(MSG_WINBIND_ONLINE);
-        message_deregister(MSG_WINBIND_ONLINESTATUS);
 
         /* The child is ok with online/offline messages now. */
@@ -960 +1040 @@
                          NULL);
 
+        primary_domain = find_our_domain();
+
+        if (primary_domain == NULL) {
+                smb_panic("no primary domain found");
+        }
+
+        /* It doesn't matter if we allow cache login,
+         * try to bring domain online after fork. */
         if ( child->domain ) {
                 child->domain->startup = True;
                 child->domain->startup_time = time(NULL);
-        }
-
-        /* Ensure we have no pending check_online events other
-           than one for this domain or the primary domain. */
-
-        for (domain = domain_list(); domain; domain = domain->next) {
-                if (domain->primary) {
-                        primary_domain = domain;
-                }
-                if ((domain != child->domain) && !domain->primary) {
-                        TALLOC_FREE(domain->check_online_event);
-                }
-        }
-
-        /* Ensure we're not handling an event inherited from
-           our parent. */
-
-        cancel_named_event(winbind_event_context(),
-                           "krb5_ticket_refresh_handler");
+                /* we can be in primary domain or in trusted domain
+                 * If we are in trusted domain, set the primary domain
+                 * in start-up mode */
+                if (!(child->domain->internal)) {
+                        set_domain_online_request(child->domain);
+                        if (!(child->domain->primary)) {
+                                primary_domain->startup = True;
+                                primary_domain->startup_time = time(NULL);
+                                set_domain_online_request(primary_domain);
+                        }
+                }
+        }
 
         /* We might be in the idmap child...*/

branches/samba-3.0/source/nsswitch/winbindd_nss.h

@@ -189 +189 @@
 
 
-#define WBFLAG_PAM_INFO3_NDR            0x0001
-#define WBFLAG_PAM_INFO3_TEXT           0x0002
-#define WBFLAG_PAM_USER_SESSION_KEY     0x0004
-#define WBFLAG_PAM_LMKEY                0x0008
-#define WBFLAG_PAM_CONTACT_TRUSTDOM     0x0010
-#define WBFLAG_QUERY_ONLY               0x0020
-#define WBFLAG_PAM_UNIX_NAME            0x0080
-#define WBFLAG_PAM_AFS_TOKEN            0x0100
-#define WBFLAG_PAM_NT_STATUS_SQUASH     0x0200
+#define WBFLAG_PAM_INFO3_NDR            0x00000001
+#define WBFLAG_PAM_INFO3_TEXT           0x00000002
+#define WBFLAG_PAM_USER_SESSION_KEY     0x00000004
+#define WBFLAG_PAM_LMKEY                0x00000008
+#define WBFLAG_PAM_CONTACT_TRUSTDOM     0x00000010
+#define WBFLAG_QUERY_ONLY               0x00000020
+#define WBFLAG_PAM_UNIX_NAME            0x00000080
+#define WBFLAG_PAM_AFS_TOKEN            0x00000100
+#define WBFLAG_PAM_NT_STATUS_SQUASH     0x00000200
 
 /* This is a flag that can only be sent from parent to child */
-#define WBFLAG_IS_PRIVILEGED            0x0400
+#define WBFLAG_IS_PRIVILEGED            0x00000400
 /* Flag to say this is a winbindd internal send - don't recurse. */
-#define WBFLAG_RECURSE                  0x0800
-
-#define WBFLAG_PAM_KRB5                 0x1000
-#define WBFLAG_PAM_FALLBACK_AFTER_KRB5  0x2000
-#define WBFLAG_PAM_CACHED_LOGIN         0x4000
-#define WBFLAG_PAM_GET_PWD_POLICY       0x8000
+#define WBFLAG_RECURSE                  0x00000800
+
+#define WBFLAG_PAM_KRB5                 0x00001000
+#define WBFLAG_PAM_FALLBACK_AFTER_KRB5  0x00002000
+#define WBFLAG_PAM_CACHED_LOGIN         0x00004000
+#define WBFLAG_PAM_GET_PWD_POLICY       0x00008000
+#define WBFLAG_BIG_NTLMV2_BLOB          0x00010000
 
 #define WINBINDD_MAX_EXTRA_DATA (128*1024)

branches/samba-3.0/source/nsswitch/winbindd_pam.c

@@ -1763 +1763 @@
         if (state->request.data.auth_crap.lm_resp_len > sizeof(state->request.data.auth_crap.lm_resp)
                 || state->request.data.auth_crap.nt_resp_len > sizeof(state->request.data.auth_crap.nt_resp)) {
-                DEBUG(0, ("winbindd_pam_auth_crap: invalid password length %u/%u\n", 
-                          state->request.data.auth_crap.lm_resp_len, 
-                          state->request.data.auth_crap.nt_resp_len));
-                result = NT_STATUS_INVALID_PARAMETER;
-                goto done;
+                if (!state->request.flags & WBFLAG_BIG_NTLMV2_BLOB ||
+                     state->request.extra_len != state->request.data.auth_crap.nt_resp_len) {
+                        DEBUG(0, ("winbindd_pam_auth_crap: invalid password length %u/%u\n",
+                                  state->request.data.auth_crap.lm_resp_len,
+                                  state->request.data.auth_crap.nt_resp_len));
+                                  result = NT_STATUS_INVALID_PARAMETER;
+                        goto done;
+                }
         }
 
         lm_resp = data_blob_talloc(state->mem_ctx, state->request.data.auth_crap.lm_resp,
                                         state->request.data.auth_crap.lm_resp_len);
-        nt_resp = data_blob_talloc(state->mem_ctx, state->request.data.auth_crap.nt_resp,
-                                        state->request.data.auth_crap.nt_resp_len);
+        if (state->request.flags & WBFLAG_BIG_NTLMV2_BLOB) {
+                nt_resp = data_blob_talloc(state->mem_ctx,
+                                           state->request.extra_data.data,
+                                           state->request.data.auth_crap.nt_resp_len);
+        } else {
+                nt_resp = data_blob_talloc(state->mem_ctx,
+                                           state->request.data.auth_crap.nt_resp,
+                                           state->request.data.auth_crap.nt_resp_len);
+        }
 
         /* what domain should we contact? */

branches/samba-3.0/source/nsswitch/winbindd_passdb.c

@@ -221 +221 @@
 
         if (!pdb_getsampwsid(user, user_sid ) ) {
+                TALLOC_FREE( user );
                 return NT_STATUS_NO_SUCH_USER;
         }

branches/samba-3.0/source/nsswitch/winbindd_proto.h

@@ -199 +199 @@
 /* The following definitions come from nsswitch/winbindd_cred_cache.c  */
 
+void ccache_remove_all_after_fork(void);
+void ccache_regain_all_now(void);
 BOOL ccache_entry_exists(const char *username);
 BOOL ccache_entry_identical(const char *username, uid_t uid, const char *ccname);
@@ -346 +348 @@
 /* The following definitions come from nsswitch/winbindd_rpc.c  */
 
-NTSTATUS msrpc_name_to_sid(struct winbindd_domain *domain,
-                            TALLOC_CTX *mem_ctx,
-                            const char *domain_name,
-                            const char *name,
-                            DOM_SID *sid,
-                            enum lsa_SidType *type);
-NTSTATUS msrpc_sid_to_name(struct winbindd_domain *domain,
-                            TALLOC_CTX *mem_ctx,
-                            const DOM_SID *sid,
-                            char **domain_name,
-                            char **name,
-                            enum lsa_SidType *type);
-NTSTATUS msrpc_rids_to_names(struct winbindd_domain *domain,
-                             TALLOC_CTX *mem_ctx,
-                             const DOM_SID *sid,
-                             uint32 *rids,
-                             size_t num_rids,
-                             char **domain_name,
-                             char ***names,
-                             enum lsa_SidType **types);
-NTSTATUS msrpc_lookup_useraliases(struct winbindd_domain *domain,
-                                  TALLOC_CTX *mem_ctx,
-                                  uint32 num_sids, const DOM_SID *sids,
-                                  uint32 *num_aliases, uint32 **alias_rids);
-NTSTATUS msrpc_lockout_policy(struct winbindd_domain *domain, 
-                              TALLOC_CTX *mem_ctx,
-                              SAM_UNK_INFO_12 *lockout_policy);
-NTSTATUS msrpc_password_policy(struct winbindd_domain *domain, 
-                               TALLOC_CTX *mem_ctx,
-                               SAM_UNK_INFO_1 *password_policy);
 
 /* The following definitions come from nsswitch/winbindd_sid.c  */

branches/samba-3.0/source/nsswitch/winbindd_rpc.c

@@ -236 +236 @@
 
 /* convert a single name to a sid in a domain */
-NTSTATUS msrpc_name_to_sid(struct winbindd_domain *domain,
-                            TALLOC_CTX *mem_ctx,
-                            const char *domain_name,
-                            const char *name,
-                            DOM_SID *sid,
-                            enum lsa_SidType *type)
+static NTSTATUS msrpc_name_to_sid(struct winbindd_domain *domain,
+                                  TALLOC_CTX *mem_ctx,
+                                  const char *domain_name,
+                                  const char *name,
+                                  DOM_SID *sid,
+                                  enum lsa_SidType *type)
 {
         NTSTATUS result;
@@ -287 +287 @@
   convert a domain SID to a user or group name
 */
-NTSTATUS msrpc_sid_to_name(struct winbindd_domain *domain,
-                            TALLOC_CTX *mem_ctx,
-                            const DOM_SID *sid,
-                            char **domain_name,
-                            char **name,
-                            enum lsa_SidType *type)
+static NTSTATUS msrpc_sid_to_name(struct winbindd_domain *domain,
+                                  TALLOC_CTX *mem_ctx,
+                                  const DOM_SID *sid,
+                                  char **domain_name,
+                                  char **name,
+                                  enum lsa_SidType *type)
 {
         char **domains;
@@ -323 +323 @@
 }
 
-NTSTATUS msrpc_rids_to_names(struct winbindd_domain *domain,
-                             TALLOC_CTX *mem_ctx,
-                             const DOM_SID *sid,
-                             uint32 *rids,
-                             size_t num_rids,
-                             char **domain_name,
-                             char ***names,
-                             enum lsa_SidType **types)
+static NTSTATUS msrpc_rids_to_names(struct winbindd_domain *domain,
+                                    TALLOC_CTX *mem_ctx,
+                                    const DOM_SID *sid,
+                                    uint32 *rids,
+                                    size_t num_rids,
+                                    char **domain_name,
+                                    char ***names,
+                                    enum lsa_SidType **types)
 {
         char **domains;
@@ -531 +531 @@
 }
 
-NTSTATUS msrpc_lookup_useraliases(struct winbindd_domain *domain,
-                                  TALLOC_CTX *mem_ctx,
-                                  uint32 num_sids, const DOM_SID *sids,
-                                  uint32 *num_aliases, uint32 **alias_rids)
+static NTSTATUS msrpc_lookup_useraliases(struct winbindd_domain *domain,
+                                         TALLOC_CTX *mem_ctx,
+                                         uint32 num_sids, const DOM_SID *sids,
+                                         uint32 *num_aliases,
+                                         uint32 **alias_rids)
 {
         NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
@@ -956 +957 @@
 
 /* find the lockout policy for a domain */
-NTSTATUS msrpc_lockout_policy(struct winbindd_domain *domain, 
-                              TALLOC_CTX *mem_ctx,
-                              SAM_UNK_INFO_12 *lockout_policy)
+static NTSTATUS msrpc_lockout_policy(struct winbindd_domain *domain, 
+                                     TALLOC_CTX *mem_ctx,
+                                     SAM_UNK_INFO_12 *lockout_policy)
 {
         NTSTATUS result;
@@ -988 +989 @@
 
 /* find the password policy for a domain */
-NTSTATUS msrpc_password_policy(struct winbindd_domain *domain, 
-                               TALLOC_CTX *mem_ctx,
-                               SAM_UNK_INFO_1 *password_policy)
+static NTSTATUS msrpc_password_policy(struct winbindd_domain *domain, 
+                                      TALLOC_CTX *mem_ctx,
+                                      SAM_UNK_INFO_1 *password_policy)
 {
         NTSTATUS result;

branches/samba-3.0/source/nsswitch/winbindd_util.c

@@ -772 +772 @@
 
         while(temp != NULL) {
-                struct getent_state *next;
+                struct getent_state *next = temp->next;
 
                 /* Free sam entries then list entry */
@@ -778 +778 @@
                 SAFE_FREE(state->sam_entries);
                 DLIST_REMOVE(state, state);
-                next = temp->next;
 
                 SAFE_FREE(temp);

branches/samba-3.0/source/param/loadparm.c

@@ -1617 +1617 @@
 
         string_set(&Globals.szLdapAdminDn, "");
-        Globals.ldap_ssl = LDAP_SSL_ON;
+        Globals.ldap_ssl = LDAP_SSL_OFF;
         Globals.ldap_passwd_sync = LDAP_PASSWD_SYNC_OFF;
         Globals.ldap_delete_dn = False;
@@ -2796 +2796 @@
         int iIndex;
 
-        if (*pszParmName == '-')
+        if (*pszParmName == '-' && !strequal(pszParmName, "-valid"))
                 return (-1);
 

branches/samba-3.0/source/printing/print_generic.c

@@ -180 +180 @@
         int numlines, i, qcount;
         print_queue_struct *queue = NULL;
-
-DEBUG(1,("generic_queue_get\n"));  //PS20080208 
+        
         /* never do substitution when running the 'lpq command' since we can't
            get it rigt when using the background update daemon.  Make the caller 

branches/samba-3.0/source/rpc_client/cli_netlogon.c

@@ -1083 +1083 @@
         return result;
 }
+
+/***************************************************************************
+LSA Server Password Set2.
+****************************************************************************/
+
+NTSTATUS rpccli_net_srv_pwset2(struct rpc_pipe_client *cli,
+                               TALLOC_CTX *mem_ctx,
+                               const char *machine_name,
+                               const char *clear_text_mach_pwd)
+{
+        prs_struct rbuf;
+        prs_struct qbuf;
+        DOM_CRED clnt_creds;
+        NET_Q_SRV_PWSET2 q;
+        NET_R_SRV_PWSET2 r;
+        uint16 sec_chan_type = 2;
+        NTSTATUS result;
+
+        creds_client_step(cli->dc, &clnt_creds);
+
+        DEBUG(4,("cli_net_srv_pwset2: srv:%s acct:%s sc: %d mc: %s\n",
+                 cli->dc->remote_machine, cli->dc->mach_acct, sec_chan_type, machine_name));
+
+        /* store the parameters */
+        init_q_srv_pwset2(&q, cli->dc->remote_machine, (const char *)cli->dc->sess_key,
+                          cli->dc->mach_acct, sec_chan_type, machine_name,
+                          &clnt_creds, clear_text_mach_pwd);
+
+        CLI_DO_RPC(cli, mem_ctx, PI_NETLOGON, NET_SRVPWSET2,
+                q, r,
+                qbuf, rbuf,
+                net_io_q_srv_pwset2,
+                net_io_r_srv_pwset2,
+                NT_STATUS_UNSUCCESSFUL);
+
+        result = r.status;
+
+        if (!NT_STATUS_IS_OK(result)) {
+                /* report error code */
+                DEBUG(0,("cli_net_srv_pwset2: %s\n", nt_errstr(result)));
+        }
+
+        /* Always check returned credentials. */
+        if (!creds_client_check(cli->dc, &r.srv_cred.challenge)) {
+                DEBUG(0,("rpccli_net_srv_pwset2: credentials chain check failed\n"));
+                return NT_STATUS_ACCESS_DENIED;
+        }
+
+        return result;
+}

branches/samba-3.0/source/rpc_parse/parse_net.c

@@ -997 +997 @@
 }
 
+/*******************************************************************
+ Inits a NET_Q_SRV_PWSET2.
+********************************************************************/
+
+void init_q_srv_pwset2(NET_Q_SRV_PWSET2 *q_s,
+                       const char *logon_srv,
+                       const char *sess_key,
+                       const char *acct_name,
+                       uint16 sec_chan,
+                       const char *comp_name,
+                       DOM_CRED *cred,
+                       const char *clear_text_mach_pwd)
+{
+        uint8_t password_buf[516];
+        NET_CRYPT_PWD new_password;
+
+        DEBUG(5,("init_q_srv_pwset2\n"));
+
+        /* Process the new password. */
+
+        encode_pw_buffer(password_buf, clear_text_mach_pwd, STR_UNICODE);
+
+        SamOEMhash(password_buf, (const unsigned char *)sess_key, 516);
+        memcpy(new_password.data, password_buf, 512);
+        new_password.length = IVAL(password_buf, 512);
+
+        init_clnt_info(&q_s->clnt_id, logon_srv, acct_name, sec_chan, comp_name, cred);
+
+        memcpy(&q_s->pwd, &new_password, sizeof(q_s->pwd));
+}
+
+/*******************************************************************
+ Reads or writes a structure.
+********************************************************************/
+
+BOOL net_io_q_srv_pwset2(const char *desc, NET_Q_SRV_PWSET2 *q_s, prs_struct *ps, int depth)
+{
+        if (q_s == NULL)
+                return False;
+
+        prs_debug(ps, depth, desc, "net_io_q_srv_pwset2");
+        depth++;
+
+        if(!prs_align(ps))
+                return False;
+
+        if(!smb_io_clnt_info("", &q_s->clnt_id, ps, depth)) /* client identification/authentication info */
+                return False;
+        if(!prs_uint8s(False, "pwd.data", ps, depth, q_s->pwd.data, 512)) /* new password - undocumented */
+                return False;
+        if(!prs_uint32("pwd.length", ps, depth, &q_s->pwd.length)) /* new password - undocumented */
+                return False;
+
+        return True;
+}
+
+/*******************************************************************
+ Reads or writes a structure.
+********************************************************************/
+
+BOOL net_io_r_srv_pwset2(const char *desc, NET_R_SRV_PWSET2 *r_s, prs_struct *ps, int depth)
+{
+        if (r_s == NULL)
+                return False;
+
+        prs_debug(ps, depth, desc, "net_io_r_srv_pwset2");
+        depth++;
+
+        if(!prs_align(ps))
+                return False;
+
+        if(!smb_io_cred("", &r_s->srv_cred, ps, depth)) /* server challenge */
+                return False;
+
+        if(!prs_ntstatus("status", ps, depth, &r_s->status))
+                return False;
+
+        return True;
+}
+
 /*************************************************************************
  Init DOM_SID2 array from a string containing multiple sids

branches/samba-3.0/source/rpc_server/srv_srvsvc_nt.c

@@ -157 +157 @@
                 
                 if ( strcmp( fname, "." ) == 0 ) {
-                        pstr_sprintf( fullpath, "%s%s", 
-                                (strchr( sharepath,':')) ? "" : "C:", sharepath );
+                        pstr_sprintf( fullpath, "C:%s", sharepath );
                 } else {
-                        pstr_sprintf( fullpath, "%s%s/%s", 
-                                (strchr( sharepath,':')) ? "" : "C:", sharepath, fname );
+                        pstr_sprintf( fullpath, "C:%s/%s", sharepath, fname );
                 }
                 string_replace( fullpath, '/', '\\' );
@@ -265 +263 @@
         pstrcpy(remark, lp_comment(snum));
         standard_sub_conn(p->conn, remark,sizeof(remark));
-        if (strchr( lp_pathname(snum), ':'))
-                pstrcpy(path, "");
-        else
-                pstrcpy(path, "C:");
+        pstrcpy(path, "C:");
         pstrcat(path, lp_pathname(snum));
 
@@ -348 +343 @@
         pstrcpy(remark, lp_comment(snum));
         standard_sub_conn(p->conn, remark,sizeof(remark));
-        if (strchr( lp_pathname(snum), ':'))
-                pstrcpy(path, "");
-        else
-                pstrcpy(path, "C:");
+        pstrcpy(path, "C:");
         pstrcat(path, lp_pathname(snum));
 
@@ -1452 +1444 @@
         /* NT is braindead - it wants a C: prefix to a pathname ! So strip it. */
         ptr = dos_pathname;
-
-#ifdef __OS2__
-
-        /* Only absolute paths allowed. */
-        if (strlen(dos_pathname) < 2 || ptr[1] != ':')
-                return NULL;
-#else
-
         if (strlen(dos_pathname) > 2 && ptr[1] == ':' && ptr[0] != '/')
                 ptr += 2;
@@ -1466 +1450 @@
         if (*ptr != '/')
                 return NULL;
-#endif
 
         return ptr;
@@ -2189 +2172 @@
 ***********************************************************************************/
 
-static const char *server_disks[] = {"C:"
-#ifdef __OS2__
-        // YD we can use a better implementation (real time scan or above idea)
-        ,"D:","E:","F:","G:","H:","I:","J:","K:","L:","M:","N:","O:"
-        ,"P:","Q:","R:","S:","T:","U:","V:","W:","X:","Y:","Z:"
-#endif
-};
+static const char *server_disks[] = {"C:"};
 
 static uint32 get_server_disk_count(void)

branches/samba-3.0/source/smbd/aio.c

@@ -254 +254 @@
         a->aio_sigevent.sigev_value.sival_int = aio_ex->mid;
 
+        become_root();
         if (SMB_VFS_AIO_READ(fsp,a) == -1) {
                 DEBUG(0,("schedule_aio_read_and_X: aio_read failed. "
                          "Error %s\n", strerror(errno) ));
                 delete_aio_ex(aio_ex);
-                return False;
-        }
+                unbecome_root();
+                return False;
+        }
+        unbecome_root();
 
         DEBUG(10,("schedule_aio_read_and_X: scheduled aio_read for file %s, "
@@ -344 +347 @@
         a->aio_sigevent.sigev_value.sival_int = aio_ex->mid;
 
+        become_root();
         if (SMB_VFS_AIO_WRITE(fsp,a) == -1) {
                 DEBUG(3,("schedule_aio_wrote_and_X: aio_write failed. "
                          "Error %s\n", strerror(errno) ));
                 delete_aio_ex(aio_ex);
-                return False;
-        }
+                unbecome_root();
+                return False;
+        }
+        unbecome_root();
 
         if (!write_through && !lp_syncalways(SNUM(fsp->conn))

branches/samba-3.0/source/smbd/build_options.c

@@ -345 +345 @@
         output(screen, "   HAVE_INTTYPES_H\n");
 #endif
+#ifdef HAVE_KEYUTILS_H
+        output(screen, "   HAVE_KEYUTILS_H\n");
+#endif
 #ifdef HAVE_KRB5_H
         output(screen, "   HAVE_KRB5_H\n");
@@ -2265 +2268 @@
         output(screen, "   WITH_CIFSMOUNT\n");
 #endif
+#ifdef WITH_CIFSUPCALL
+        output(screen, "   WITH_CIFSUPCALL\n");
+#endif
 #ifdef WITH_DFS
         output(screen, "   WITH_DFS\n");
@@ -2613 +2619 @@
 #ifdef WITH_CIFSMOUNT
         output(screen, "   WITH_CIFSMOUNT\n");
+#endif
+#ifdef WITH_CIFSUPCALL
+        output(screen, "   WITH_CIFSUPCALL\n");
 #endif
 #ifdef WITH_DFS

branches/samba-3.0/source/smbd/conn.c

@@ -262 +262 @@
         handle = conn->vfs_handles;
         while(handle) {
+                thandle = handle->next;
                 DLIST_REMOVE(conn->vfs_handles, handle);
-                thandle = handle->next;
                 if (handle->free_data)
                         handle->free_data(&handle->data);

branches/samba-3.0/source/smbd/dosmode.c

@@ -78 +78 @@
         mode_t dir_mode = 0; /* Mode of the inherit_from directory if
                               * inheriting. */
+
         if (!lp_store_dos_attributes(SNUM(conn)) && IS_DOS_READONLY(dosmode)) {
                 result &= ~(S_IWUSR | S_IWGRP | S_IWOTH);
@@ -167 +168 @@
                 }
         } /* Else never set the readonly bit. */
+
 #ifndef __OS2__
         if (MAP_ARCHIVE(conn) && ((sbuf->st_mode & S_IXUSR) != 0))

branches/samba-3.0/source/smbd/files.c

@@ -125 +125 @@
         chain_fsp = fsp;
 
-        /* A new fsp invalidates a negative fsp_fi_cache. */
-        if (fsp_fi_cache.fsp == NULL) {
-                ZERO_STRUCT(fsp_fi_cache);
-        }
+        /* A new fsp invalidates the positive and
+           negative fsp_fi_cache as the new fsp is pushed
+           at the start of the list and we search from
+           a cache hit to the *end* of the list. */
+
+        ZERO_STRUCT(fsp_fi_cache);
 
         *result = fsp;

branches/samba-3.0/source/smbd/msdfs.c

@@ -714 +714 @@
                                 char **ppdata, 
                                 struct junction_map *junction,
-                                int consumedcnt,
                                 BOOL self_referral)
 {
@@ -771 +770 @@
 
         /* create the header */
-        SSVAL(pdata,0,consumedcnt * 2); /* path consumed */
+        SSVAL(pdata,0,requestedpathlen - 2); /* UCS2 of path consumed minus
+
         SSVAL(pdata,2,junction->referral_count); /* number of referral in this pkt */
         if(self_referral) {
@@ -815 +815 @@
                                 char **ppdata, 
                                 struct junction_map *junction,
-                                int consumedcnt,
                                 BOOL self_referral)
 {
@@ -853 +852 @@
 
         /* create the header */
-        SSVAL(pdata,0,consumedcnt * 2); /* path consumed */
+        SSVAL(pdata,0,reqpathlen - 2); /* UCS2 of path consumed minus
+                                          2 byte null */
+
         SSVAL(pdata,2,junction->referral_count); /* number of referral */
         if(self_referral) {
@@ -975 +976 @@
         case 2:
                 reply_size = setup_ver2_dfs_referral(pathnamep, ppdata, &junction, 
-                                                     consumedcnt, self_referral);
+                                                     self_referral);
                 break;
         case 3:
                 reply_size = setup_ver3_dfs_referral(pathnamep, ppdata, &junction, 
-                                                     consumedcnt, self_referral);
+                                                     self_referral);
                 break;
         default:

branches/samba-3.0/source/smbd/notify.c

@@ -349 +349 @@
 {
         char *fullpath;
+
+        if (path[0] == '.' && path[1] == '/') {
+                path += 2;
+        }
 
         if (asprintf(&fullpath, "%s/%s", conn->connectpath, path) == -1) {

branches/samba-3.0/source/smbd/password.c

@@ -271 +271 @@
                         const char *unix_homedir =
                                 pdb_get_unix_homedir(server_info->sam_account);
-
                         if (unix_homedir) {
                                 vuser->unix_homedir =
@@ -356 +355 @@
                                         vuser->unix_homedir[1] = ':';
 #endif
-
 
         if ( (!vuser->guest) && vuser->unix_homedir && *(vuser->unix_homedir)) 

branches/samba-3.0/source/smbd/posix_acls.c

@@ -3120 +3120 @@
 }
 
+#if 0
+/* Disable this - prevents ACL inheritance from the ACL editor. JRA. */
+
 /****************************************************************************
  Take care of parent ACL inheritance.
@@ -3301 +3304 @@
         }
 
-        parent_sd->dacl->aces = new_ace;
-        parent_sd->dacl->num_aces = i;
-
-        *pp_new_sd = parent_sd;
+        /* This sucks. psd should be const and we should
+         * be doing a deep-copy here. We're getting away
+         * with is as we know parent_sd is talloced off
+         * talloc_tos() as well as psd. JRA. */
+
+        psd->dacl->aces = new_ace;
+        psd->dacl->num_aces = i;
+        psd->type &= ~(SE_DESC_DACL_AUTO_INHERITED|
+                         SE_DESC_DACL_AUTO_INHERIT_REQ);
+
+        *pp_new_sd = psd;
         return status;
 }
+#endif
 
 /****************************************************************************
@@ -3420 +3431 @@
         create_file_sids(&sbuf, &file_owner_sid, &file_grp_sid);
 
+#if 0
+        /* Disable this - prevents ACL inheritance from the ACL editor. JRA. */
+
+        /* See here: http://www.codeproject.com/KB/winsdk/accessctrl2.aspx
+         * for details and also the log trace in bug #4308. JRA.
+        */
+
         if ((security_info_sent & DACL_SECURITY_INFORMATION) &&
                 psd->dacl != NULL &&
@@ -3431 +3449 @@
                 }
         }
+#endif
 
         acl_perms = unpack_canon_ace( fsp, &sbuf, &file_owner_sid, &file_grp_sid,
@@ -4271 +4290 @@
                 return False;
         }
+#ifndef __OS2__
+        /* Samba always runs as root on OS/2 */
         if (current_user.ut.uid == 0 || conn->admin_user) {
                 /* I'm sorry sir, I didn't know you were root... */
                 return True;
         }
+#endif
 
         /* Check primary owner write access. */
@@ -4327 +4349 @@
                 (unsigned int)access_mask, fname ));
 
-#ifndef __OS2__
-        /* Samba always runs as root on OS/2 */
         if (current_user.ut.uid == 0 || conn->admin_user) {
                 /* I'm sorry sir, I didn't know you were root... */
                 return True;
         }
-#endif
+
         if (!VALID_STAT(*psbuf)) {
                 /* Get the file permission mask and owners. */

branches/samba-3.0/source/smbd/process.c

@@ -968 +968 @@
 
                         if (!change_to_user(conn,session_tag)) {
+                                remove_deferred_open_smb_message(
+                                        SVAL(inbuf, smb_mid));
                                 return(ERROR_NT(NT_STATUS_DOS(ERRSRV,ERRbaduid)));
                         }

branches/samba-3.0/source/smbd/reply.c

@@ -169 +169 @@
 
         *d = '\0';
-
         return ret;
 }
@@ -2215 +2214 @@
 
                 if ( SMB_VFS_SENDFILE( smbd_server_fd(), fsp, fsp->fh->fd, &header, startpos, nread) == -1) {
-                        /* Returning ENOSYS means no data at all was sent. Do this as a normal read. */
+                        /* Returning ENOSYS means no data at all was sent.
+                           Do this as a normal read. */
                         if (errno == ENOSYS) {
                                 goto normal_readbraw;
@@ -4645 +4645 @@
                         DEBUG(3,("rename_internals: succeeded doing rename "
                                  "on %s -> %s\n", directory, newname));
+                        notify_rename(conn, S_ISDIR(sbuf1.st_mode),
+                                      directory, newname);
                         rename_open_files(conn, lck, sbuf1.st_dev,
                                           sbuf1.st_ino, newname);
                         TALLOC_FREE(lck);
-                        notify_rename(conn, S_ISDIR(sbuf1.st_mode),
-                                      directory, newname);
                         return NT_STATUS_OK;    
                 }

branches/samba-3.0/source/smbd/server.c

@@ -300 +300 @@
  Open the socket communication.
 ****************************************************************************/
+
+bool reinit_after_fork(struct messaging_context *msg_ctx,
+                        struct event_context *ev_ctx,
+                        bool parent_longlived);
 
 static BOOL open_sockets_smbd(BOOL is_daemon, BOOL interactive, const char *smb_ports)
@@ -561 +565 @@
                                                         False);
                                 
-                                /* Reset the state of the random
-                                 * number generation system, so
-                                 * children do not get the same random
-                                 * numbers as each other */
-
-                                set_need_random_reseed();
-                                /* tdb needs special fork handling - remove
-                                 * CLEAR_IF_FIRST flags */
-                                if (tdb_reopen_all(1) == -1) {
-                                        DEBUG(0,("tdb_reopen_all failed.\n"));
-                                        smb_panic("tdb_reopen_all failed.");
+                                if (!reinit_after_fork(smbd_messaging_context(),
+                                                       smbd_event_context(),
+                                                       true)) {
+                                        DEBUG(0, ("reinit_after_fork failed.\n"));
+                                        smb_panic("reinit_after_fork failed.\n");
                                 }
 
                                 return True; 
                         }
+                        /* The parent doesn't need this socket */
+                        close(smbd_server_fd()); 
 
                         /* Sun May 6 18:56:14 2001 ackley@cs.unm.edu:
@@ -946 +946 @@
 
         reopen_logs();
+
 #ifdef __OS2__
         unsigned long  _System DosSetPriority (unsigned long  ulScope, unsigned long  ulClass, long lDelta, unsigned long ulID);
@@ -956 +957 @@
         DEBUG(0,( "Server priority set to PRTYC_FOREGROUNDSERVER\n"));
 #endif
+
         DEBUG(0,( "smbd version %s started.\n", SAMBA_VERSION_STRING));
         DEBUGADD( 0, ( "%s\n", COPYRIGHT_STARTUP_MESSAGE ) );

branches/samba-3.0/source/smbd/sesssetup.c

@@ -99 +99 @@
 /****************************************************************************
  Send a security blob via a session setup reply.
+ We must already have called set_message(outbuf,4,0,True)
+ before calling this function.
 ****************************************************************************/
 
@@ -109 +111 @@
                 ERROR_NT(nt_status_squash(nt_status));
         } else {
-                set_message(outbuf,4,0,True);
-
                 nt_status = nt_status_squash(nt_status);
                 SIVAL(outbuf, smb_rcls, NT_STATUS_V(nt_status));
@@ -519 +519 @@
         SAFE_FREE(client);
 
+        set_message(outbuf,4,0,True);
+
         if (sess_vuid == UID_FIELD_INVALID ) {
                 ret = NT_STATUS_LOGON_FAILURE;
@@ -525 +527 @@
                 reload_services( True );
 
-                set_message(outbuf,4,0,True);
                 SSVAL(outbuf, smb_vwv3, 0);
                         
@@ -582 +583 @@
         }
 
+        set_message(outbuf,4,0,True);
+
         if (NT_STATUS_IS_OK(nt_status)) {
                 int sess_vuid;
@@ -598 +601 @@
                         reload_services( True );
 
-                        set_message(outbuf,4,0,True);
                         SSVAL(outbuf, smb_vwv3, 0);
                         

branches/samba-3.0/source/smbd/share_access.c

@@ -193 +193 @@
  */
 
-BOOL user_ok_token(const char *username, struct nt_user_token *token, int snum)
+BOOL user_ok_token(const char *username, const struct nt_user_token *token, int snum)
 {
         if (lp_invalid_users(snum) != NULL) {
@@ -250 +250 @@
 
 BOOL is_share_read_only_for_token(const char *username,
-                                  struct nt_user_token *token, int snum)
+                                  const struct nt_user_token *token, int snum)
 {
         BOOL result = lp_readonly(snum);

branches/samba-3.0/source/smbd/trans2.c

@@ -205 +205 @@
         }
 
-        if (sizeret == -1){
-                return NULL;}
+        if (sizeret == -1)
+                return NULL;
 
         DEBUG(10,("get_ea_list_from_file: ea_namelist size = %u\n", (unsigned int)sizeret ));
@@ -303 +303 @@
         size_t total_ea_len = 0;
         TALLOC_CTX *mem_ctx = NULL;
+
         if (!lp_ea_support(SNUM(conn))) {
                 return 0;
@@ -865 +866 @@
                         return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
                 }
-        } else if (IVAL(pdata,0) != 4) {
-                return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
         }
 
@@ -977 +976 @@
         if (mask[0] == '.' && mask[1] == 0)
                 return False;
+        if (dptr_has_wild(conn->dirptr)) {
+                return False;
+        }
         if (conn->case_sensitive)
                 return strcmp(str,mask)==0;
-        if (StrCaseCmp(str,mask) != 0) {
-                return False;
-        }
-        if (dptr_has_wild(conn->dirptr)) {
-                return False;
-        }
-        return True;
+        else
+                return StrCaseCmp(str,mask) == 0;
 }
 
@@ -4162 +4159 @@
                         fsp_set_pending_modtime(fsp, ts[1]);
                 }
+
         }
 #ifdef __OS2__
@@ -6190 +6188 @@
                 return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
         }
+        /* If total_data == 4 Windows doesn't care what values
+         * are placed in that field, it just ignores them.
+         * The System i QNTC IBM SMB client puts bad values here,
+         * so ignore them. */
 
         status = create_directory(conn, directory);

branches/samba-3.0/source/smbd/uid.c

@@ -143 +143 @@
 }
 
+/*******************************************************************
+ Check if a username is OK in share level security.
+********************************************************************/
+
+static bool check_user_ok_sharelevel_security(connection_struct *conn,
+                                        const char *unix_name,
+                                        int snum)
+{
+        NT_USER_TOKEN *token = conn->nt_user_token;
+
+        if (!user_ok_token(unix_name, token, snum)) {
+                return false;
+        }
+
+        conn->read_only = is_share_read_only_for_token(unix_name,
+                                                      token,
+                                                      snum);
+
+        if (!conn->read_only &&
+            !share_access_check(token, lp_servicename(snum),
+                                FILE_WRITE_DATA)) {
+                /* smb.conf allows r/w, but the security descriptor denies
+                 * write. Fall back to looking at readonly. */
+                conn->read_only = true;
+                DEBUG(5,("falling back to read-only access-evaluation due to "
+                         "security descriptor\n"));
+        }
+
+        if (!share_access_check(token, lp_servicename(snum),
+                                conn->read_only ?
+                                FILE_READ_DATA : FILE_WRITE_DATA)) {
+                return false;
+        }
+
+        conn->admin_user = token_contains_name_in_list(
+                                unix_name, NULL, token,
+                                lp_admin_users(SNUM(conn)));
+
+        return true;
+}
+
+
 /****************************************************************************
  Become the user of a connection number without changing the security context
@@ -150 +192 @@
 BOOL change_to_user(connection_struct *conn, uint16 vuid)
 {
+        enum security_types sec = (enum security_types)lp_security();
         user_struct *vuser = get_valid_user_struct(vuid);
-
         int snum;
         gid_t gid;
@@ -173 +215 @@
          */
 
-        if((lp_security() == SEC_SHARE) && (current_user.conn == conn) &&
+        if((sec == SEC_SHARE) && (current_user.conn == conn) &&
            (current_user.ut.uid == conn->uid)) {
                 DEBUG(4,("change_to_user: Skipping user change - already "
@@ -194 +236 @@
                          lp_servicename(snum)));
                 return False;
+        } else if ((sec == SEC_SHARE) && !check_user_ok_sharelevel_security(conn,
+                        conn->user, snum)) {
+                DEBUG(2,("change_to_user: unix user %s "
+                         "not permitted access to share %s.\n",
+                         conn->user,
+                         lp_servicename(snum)));
+                return false;
         }
 
@@ -273 +322 @@
         DEBUG(5,("change_to_user uid=(%d,%d) gid=(%d,%d)\n",
                  (int)getuid(),(int)geteuid(),(int)getgid(),(int)getegid()));
-
+  
         return(True);
 }

branches/samba-3.0/source/tdb/common/io.c

@@ -101 +101 @@
         if (tdb->map_ptr) {
                 memcpy(off + (char *)tdb->map_ptr, buf, len);
-        } else if (pwrite(tdb->fd, buf, len, off) != (ssize_t)len) {
-                /* Ensure ecode is set for log fn. */
-                tdb->ecode = TDB_ERR_IO;
-                TDB_LOG((tdb, TDB_DEBUG_FATAL,"tdb_write failed at %d len=%d (%s)\n",
-                           off, len, strerror(errno)));
-        } else {
-                ssize_t written = pwrite(tdb->fd, buf, len, off);
-                if ((written != (ssize_t)len) && (written != -1)) {
-                        /* try once more */
-                        TDB_LOG((tdb, TDB_DEBUG_FATAL, "tdb_write: wrote only "
-                                 "%d of %d bytes at %d, trying once more\n",
+        } else {
+                ssize_t written = pwrite(tdb->fd, buf, len, off);
+                if ((written != (ssize_t)len) && (written != -1)) {
+                        /* try once more */
+                        TDB_LOG((tdb, TDB_DEBUG_FATAL, "tdb_write: wrote only "
+                                 "%d of %d bytes at %d, trying once more\n",
                                  (uint32_t)written, len, off));
-                        errno = ENOSPC;
-                        written = pwrite(tdb->fd, (void *)((char *)buf+written),
-                                         len-written,
-                                         off+written);
-                }
-                if (written == -1) {
-                        /* Ensure ecode is set for log fn. */
-                        tdb->ecode = TDB_ERR_IO;
-                        TDB_LOG((tdb, TDB_DEBUG_FATAL,"tdb_write failed at %d "
-                                 "len=%d (%s)\n", off, len, strerror(errno)));
-                        return TDB_ERRCODE(TDB_ERR_IO, -1);
-                } else if (written != (ssize_t)len) {
-                        TDB_LOG((tdb, TDB_DEBUG_FATAL, "tdb_write: failed to "
-                                 "write %d bytes at %d in two attempts\n",
-                                 len, off));
-                        errno = ENOSPC;
+                        errno = ENOSPC;
+                        written = pwrite(tdb->fd, (void *)((char *)buf+written),
+                                         len-written,
+                                         off+written);
+                }
+                if (written == -1) {
+                        /* Ensure ecode is set for log fn. */
+                        tdb->ecode = TDB_ERR_IO;
+                        TDB_LOG((tdb, TDB_DEBUG_FATAL,"tdb_write failed at %d "
+                                 "len=%d (%s)\n", off, len, strerror(errno)));
+                        return TDB_ERRCODE(TDB_ERR_IO, -1);
+                } else if (written != (ssize_t)len) {
+                        TDB_LOG((tdb, TDB_DEBUG_FATAL, "tdb_write: failed to "
+                                 "write %d bytes at %d in two attempts\n",
+                                 len, off));
+                        errno = ENOSPC;
 #ifdef __OS2__
                 // remove our lock
@@ -215 +210 @@
 #ifdef HAVE_MMAP
         if (tdb->map_ptr) {
-                int ret = munmap(tdb->map_ptr, tdb->map_size);
+                int ret;
+
+                ret = munmap(tdb->map_ptr, tdb->map_size);
                 if (ret != 0)
                         return ret;

branches/samba-3.0/source/tdb/common/open.c

@@ -364 +364 @@
          * do with disk files, and resume here by releasing their
          * global lock and hooking into the active list. */
+#ifndef __OS2__
+        if (tdb->methods->tdb_brlock(tdb, GLOBAL_LOCK, F_UNLCK, F_SETLKW, 0, 1) == -1)
+                goto fail;
+#endif
         tdb->next = tdbs;
         tdbs = tdb;
@@ -370 +374 @@
  fail:
         { int save_errno = errno;
-        tdb->methods->tdb_brlock(tdb, GLOBAL_LOCK, F_UNLCK, F_SETLKW, 0, 1);
 
         if (!tdb)
@@ -555 +558 @@
         if ((tdb->flags & TDB_CLEAR_IF_FIRST) && 
             (tdb->methods->tdb_brlock(tdb, ACTIVE_LOCK, F_RDLCK, F_SETLKW, 0, 1) == -1)) {
-// YD sem handle was wrong, testme #ifndef __OS2__ // PS 20070511 hack for WINS server crash
                 TDB_LOG((tdb, TDB_DEBUG_FATAL, "tdb_reopen: failed to obtain active lock\n"));
                 goto fail;
-//#endif
         }
         if (fstat(tdb->fd, &st) != 0) {

branches/samba-3.0/source/tdb/common/transaction.c

@@ -558 +558 @@
                 return -1;
         }
-#ifdef MS_SYNC
+#ifdef HAVE_MMAP
         if (tdb->map_ptr) {
                 tdb_off_t moffset = offset & ~(tdb->page_size-1);

branches/samba-3.0/source/utils/net_ads.c

@@ -307 +307 @@
                 tried_closest_dc = True; /* avoid loop */
 
-                if (!ads->config.tried_closest_dc) {
+                if (!ads_closest_dc(ads)) {
 
                         namecache_delete(ads->server.realm, 0x1C);
@@ -1575 +1575 @@
                 goto fail;
         }
+
+        saf_join_store(ads->server.workgroup, ads->config.ldap_server_name);
+        saf_join_store(ads->server.realm, ads->config.ldap_server_name);
 
         /* Verify that everything is ok */

branches/samba-3.0/source/utils/net_rpc.c

@@ -228 +228 @@
 int net_rpc_changetrustpw(int argc, const char **argv) 
 {
+        net_use_machine_account();
+
         return run_rpc_command(NULL, PI_NETLOGON, NET_FLAGS_ANONYMOUS | NET_FLAGS_PDC, 
                                rpc_changetrustpw_internals,

branches/samba-3.0/source/utils/ntlm_auth.c

@@ -351 +351 @@
 
         if (nt_response && nt_response->length) {
-                memcpy(request.data.auth_crap.nt_resp, 
-                       nt_response->data, 
-                       MIN(nt_response->length, sizeof(request.data.auth_crap.nt_resp)));
+                if (nt_response->length > sizeof(request.data.auth_crap.nt_resp)) {
+                        request.flags = request.flags | WBFLAG_BIG_NTLMV2_BLOB;
+                        request.extra_len = nt_response->length;
+                        request.extra_data.data = SMB_MALLOC_ARRAY(char, request.extra_len);
+                        if (request.extra_data.data == NULL) {
+                                return NT_STATUS_NO_MEMORY;
+                        }
+                        memcpy(request.extra_data.data, nt_response->data,
+                               nt_response->length);
+
+                } else {
+                        memcpy(request.data.auth_crap.nt_resp,
+                               nt_response->data, nt_response->length);
+                }
                 request.data.auth_crap.nt_resp_len = nt_response->length;
         }
-        
+
         result = winbindd_request_response(WINBINDD_PAM_AUTH_CRAP, &request, &response);
+        SAFE_FREE(request.extra_data.data);
 
         /* Display response */

branches/samba-3.0/source/utils/smbtree.c

@@ -32 +32 @@
 /* Holds a list of workgroups or servers */
 
-struct name_list {
-        struct name_list *prev, *next;
+struct smb_name_list {
+        struct smb_name_list *prev, *next;
         pstring name, comment;
         uint32 server_type;
 };
 
-static struct name_list *workgroups, *servers, *shares;
-
-static void free_name_list(struct name_list *list)
+static struct smb_name_list *workgroups, *servers, *shares;
+
+static void free_name_list(struct smb_name_list *list)
 {
         while(list)
@@ -49 +49 @@
                      const char *comment, void *state)
 {
-        struct name_list **name_list = (struct name_list **)state;
-        struct name_list *new_name;
-
-        new_name = SMB_MALLOC_P(struct name_list);
+        struct smb_name_list **name_list = (struct smb_name_list **)state;
+        struct smb_name_list *new_name;
+
+        new_name = SMB_MALLOC_P(struct smb_name_list);
 
         if (!new_name)
@@ -200 +200 @@
 static BOOL print_tree(struct user_auth_info *user_info)
 {
-        struct name_list *wg, *sv, *sh;
+        struct smb_name_list *wg, *sv, *sh;
 
         /* List workgroups */

branches/samba-3.0/source/web/statuspage.c

@@ -43 +43 @@
         /* show machine name rather PID on table "Open Files"? */
         if (PID_or_Machine) {
-                PIDMAP *p;
-
-                for (p = pidmap; p != NULL; ) {
+                PIDMAP *p, *next;
+
+                for (p = pidmap; p != NULL; p = next) {
+                        next = p->next;
                         DLIST_REMOVE(pidmap, p);
                         SAFE_FREE(p->machine);

branches/samba-3.0/source/web/swat.c

@@ -464 +464 @@
 
         write_config(f, False);
-        if (snum)
+        if (snum >= 0)
                 lp_dump_one(f, False, snum);
         fclose(f);