Hello community, here is the log from the commit of package samba checked in at Fri Jul 25 17:04:17 CEST 2008. -------- --- samba/samba.changes 2008-07-03 14:31:51.000000000 +0200 +++ /mounts/work_src_done/STABLE/samba/samba.changes 2008-07-25 09:22:38.000000000 +0200 @@ -1,0 +2,88 @@ +Fri Jul 25 09:22:13 CEST 2008 - anschneider@suse.de + +- Remove trailing withespace from wbinfo -m which breaks gdm auth. + +------------------------------------------------------------------- +Thu Jul 24 15:13:15 CEST 2008 - anschneider@suse.de + +- Add a recommendation to the samba and samba-winbind package to install + logrotate for openSUSE 11.0 and later. + +------------------------------------------------------------------- +Wed Jul 23 16:27:57 CEST 2008 - hare@suse.de + +- Include mkinitrd scriptlets. + +------------------------------------------------------------------- +Mon Jul 21 08:37:01 CEST 2008 - boyang@suse.de + +- Allow %u parameters for print job username - use advanced sub; (bnc#374389). + +------------------------------------------------------------------- +Thu Jul 17 18:10:03 CEST 2008 - lmuelle@suse.de + +- Update to 3.0.31. + + BUG 5504: Fix SIGTERM handling in Winbind children so that they do not + remove the unix domain socket used to field client requests. + + Split the winbindd_passdb backend into a 'builtin' and a 'sam' backend. + + When allocating client buffers for large read/write - make sure we take + account of the large read/write SMB headers as well as the buffer space. + + Memory leak fixes in DC location code. + + BUG 5533: Winbindd fails to cope correctly with a workgroup name + containing a '.' + + BUG 5555: Don't return NT_STATUS_PASSWORD_MUST_CHANGE error on machine + account logon. + + BUG 5551: smbd recursing back into winbindd from a winbindd call. + + Fix usage message for "net rpc trustdom add". + + Ensure consistent use of pdb_get_nt_passwd instead of pdb_get_lanman_passwd. + + BUG 5578: Bad (non-Samba) use of strlcat gives error. + + Canonicalize servername in the printer functions to remove leading '\\' + characters. + + Documentation build fixes. + + [DOCS] Fix use of smbconfoption in samba.entities. + + Return NULL in sitename_fetch() if gencache_init() fails. + + Use machine account and machine password from our domain when contacting + trusted domains. + + SPNEGO SPN fix when contacting trusted domains. + + BUG 5285: Fix libcap header mismatch. + + Fix joining NT4 domains. + + Don't let winbind getgroups crash when we have no gids in the token. + + Fallback to level 24 pwd set while joining. + + Fix joining w2k domains in "security = ads". + + Fix pam_sm_chauthtok for storing modified cached creds. + + BUG 5202: Re-activate "acl group control" parameter and make it only apply + to owning group. + + BUG 5531: Fix conversion of ns units when converting from nttime to + timespec. + + BUG 4974: Map NT_STATUS_OBJECT_PATH_NOT_FOUND to ENOENT in libsmbclient. + + Fix a segfault in base64_encode_data_blob. + + AIX build fixes. + + ENODATA is not defined in freeBSD 4.6.2. + + Don't reset password last set time just because the expired flag is set to + 0. + + Fix usage message for 'net idmap dump'. + + Miscellaneous man page fixes. + + BUG 4203: Samba3-HOWTO: Add improvements/fixes submitted by Pete Boyd. + + Fixes to man pages. + + Add tdb file documentation. + + Ensure that winbindd trusted domain children keep primary domain online + status up to date. + + Update cached creds during password change. + + Ensure that Winbind always uses set_domain_offline() to mark a domain + offline. + + Allow authentication and memory credential refresh after password change + from gdm/xdm. + + Memory leak fixes. + +------------------------------------------------------------------- +Tue Jul 8 08:14:38 CEST 2008 - boyang@suse.de + +- Allow authentication and memory credential refresh after password change + from gdm/xdm. Patch from boyang <boyang@novell.com>. Jeremy; [bnc#395578]. + +------------------------------------------------------------------- +Fri Jul 4 16:22:17 CEST 2008 - lmuelle@suse.de + +- Add SMB_VFS_OP_RECVFILE to vfs_op_names to get it in sync with vfs.h. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ samba-doc.spec ++++++ --- /var/tmp/diff_new_pack.n10772/_old 2008-07-25 17:01:32.000000000 +0200 +++ /var/tmp/diff_new_pack.n10772/_new 2008-07-25 17:01:32.000000000 +0200 @@ -19,7 +19,7 @@ License: GPL v3 or later Url: http://www.samba.org/ Version: 3.2.0 -Release: 25 +Release: 33 Summary: Samba Documentation Group: Documentation/Other AutoReqProv: on @@ -299,7 +299,7 @@ -------- The Samba Team <samba@samba.org> -Source Timestamp: 1842 +Source Timestamp: 1861 Branch : trunk %changelog ++++++ samba.spec ++++++ --- /var/tmp/diff_new_pack.n10772/_old 2008-07-25 17:01:32.000000000 +0200 +++ /var/tmp/diff_new_pack.n10772/_new 2008-07-25 17:01:32.000000000 +0200 @@ -44,10 +44,10 @@ Url: http://www.samba.org/ AutoReqProv: on Version: 3.2.0 -Release: 25 +Release: 32 Requires: samba-client >= %{version} %if 0%{?suse_version} > 1030 -Recommends: cron +Recommends: cron logrotate %endif PreReq: /bin/cp /bin/mkdir /bin/mv /bin/rm /bin/touch /usr/bin/dirname /usr/bin/grep /usr/sbin/groupadd /usr/bin/tr Summary: A SMB/CIFS File, Print, and Authentication Server @@ -111,7 +111,7 @@ -------- The Samba Team <samba@samba.org> -Source Timestamp: 1842 +Source Timestamp: 1861 Branch : trunk %package client @@ -148,7 +148,7 @@ -------- The Samba Team <samba@samba.org> -Source Timestamp: 1842 +Source Timestamp: 1861 Branch : trunk %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -169,7 +169,7 @@ -------- The Samba Team <samba@samba.org> -Source Timestamp: 1842 +Source Timestamp: 1861 Branch : trunk %endif @@ -199,7 +199,7 @@ -------- The Samba Team <samba@samba.org> -Source Timestamp: 1842 +Source Timestamp: 1861 Branch : trunk %endif @@ -225,7 +225,7 @@ -------- Jeremy Allison <jra at samba dot org> -Source Timestamp: 1842 +Source Timestamp: 1861 Branch : trunk %if %{make_utils} @@ -258,7 +258,7 @@ Obsoletes: samba3-winbind Requires: samba-client >= %{version} %if 0%{?suse_version} > 1030 -Recommends: cron +Recommends: cron logrotate %endif PreReq: /bin/ln /sbin/ldconfig /sbin/insserv /bin/rm @@ -271,7 +271,7 @@ -------- The Samba Team <samba@samba.org> -Source Timestamp: 1842 +Source Timestamp: 1861 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -306,7 +306,7 @@ -------- The Samba Team <samba@samba.org> -Source Timestamp: 1842 +Source Timestamp: 1861 Branch : trunk %else @@ -320,7 +320,7 @@ -------- The Samba Team <samba@samba.org> -Source Timestamp: 1842 +Source Timestamp: 1861 Branch : trunk %endif @@ -354,7 +354,7 @@ -------- The Samba Team <samba@samba.org> -Source Timestamp: 1842 +Source Timestamp: 1861 Branch : trunk %package -n libnetapi0 @@ -373,7 +373,7 @@ -------- The Samba Team <samba@samba.org> -Source Timestamp: 1842 +Source Timestamp: 1861 Branch : trunk %package -n libnetapi-devel @@ -393,7 +393,7 @@ -------- The Samba Team <samba@samba.org> -Source Timestamp: 1842 +Source Timestamp: 1861 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -420,7 +420,7 @@ -------- The Samba Team <samba@samba.org> -Source Timestamp: 1842 +Source Timestamp: 1861 Branch : trunk %else @@ -434,7 +434,7 @@ -------- The Samba Team <samba@samba.org> -Source Timestamp: 1842 +Source Timestamp: 1861 Branch : trunk %endif @@ -465,7 +465,7 @@ -------- The Samba Team <samba@samba.org> -Source Timestamp: 1842 +Source Timestamp: 1861 Branch : trunk %if %{make_ldapsmb} @@ -486,7 +486,7 @@ -------- The Samba Team <samba@samba.org> -Source Timestamp: 1842 +Source Timestamp: 1861 Branch : trunk %package -n libtalloc-devel @@ -506,7 +506,7 @@ -------- The Samba Team <samba@samba.org> -Source Timestamp: 1842 +Source Timestamp: 1861 Branch : trunk %package -n libtdb1 @@ -525,7 +525,7 @@ -------- The Samba Team <samba@samba.org> -Source Timestamp: 1842 +Source Timestamp: 1861 Branch : trunk %package -n libtdb-devel @@ -545,7 +545,7 @@ -------- The Samba Team <samba@samba.org> -Source Timestamp: 1842 +Source Timestamp: 1861 Branch : trunk %package -n libwbclient0 @@ -564,7 +564,7 @@ -------- The Samba Team <samba@samba.org> -Source Timestamp: 1842 +Source Timestamp: 1861 Branch : trunk %package -n libwbclient-devel @@ -584,7 +584,7 @@ -------- The Samba Team <samba@samba.org> -Source Timestamp: 1842 +Source Timestamp: 1861 Branch : trunk %package -n ldapsmb @@ -593,7 +593,7 @@ Group: Productivity/Networking/Samba AutoReqProv: on Version: 1.34b -Release: 198 +Release: 205 Requires: perl-ldap %description -n ldapsmb @@ -606,7 +606,7 @@ -------- Guenther Deschner <guenther at deschner dot de> -Source Timestamp: 1842 +Source Timestamp: 1861 Branch : trunk %endif @@ -628,7 +628,7 @@ -------- Steve French <sfrench at Samba dot org> -Source Timestamp: 1842 +Source Timestamp: 1861 Branch : trunk %endif @@ -658,7 +658,7 @@ -------- Rainer Link <rainer@openantivirus.org> -Source Timestamp: 1842 +Source Timestamp: 1861 Branch : trunk %endif @@ -955,6 +955,12 @@ echo "%config(noreplace) %{_sysconfdir}/logrotate.d/${file}" >>${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-${file} done cp -p docu/README.vendor ${RPM_BUILD_ROOT}/%{DOCDIR}/README.%{VENDOR} +# Install mkinitrd scripts for boot process +%if 0%{?suse_version} > 1100 +%__install -d %{buildroot}/lib/mkinitrd/scripts +%__install -m 755 mkinitrd/mkinitrd-boot.sh %{buildroot}/lib/mkinitrd/scripts/boot-cifs.sh +%__install -m 755 mkinitrd/mkinitrd-setup.sh %{buildroot}/lib/mkinitrd/scripts/setup-cifs.sh +%endif # SuSEhelp files cp -p docu/Samba.desktop ${RPM_BUILD_ROOT}/%{_datadir}/susehelp/meta/Administration/System cp -p docu/manpages.html ../docs/htmldocs @@ -1606,9 +1612,82 @@ /sbin/umount.cifs %doc %{_mandir}/man8/mount.cifs.8.* %doc %{_mandir}/man8/umount.cifs.8.* +%if 0%{?suse_version} > 1100 +%dir /lib/mkinitrd +%dir /lib/mkinitrd/scripts +/lib/mkinitrd/scripts/setup-cifs.sh +/lib/mkinitrd/scripts/boot-cifs.sh +%endif %endif %changelog +* Fri Jul 25 2008 anschneider@suse.de +- Remove trailing withespace from wbinfo -m which breaks gdm auth. +* Thu Jul 24 2008 anschneider@suse.de +- Add a recommendation to the samba and samba-winbind package to install + logrotate for openSUSE 11.0 and later. +* Wed Jul 23 2008 hare@suse.de +- Include mkinitrd scriptlets. +* Mon Jul 21 2008 boyang@suse.de +- Allow %%u parameters for print job username - use advanced sub; (bnc#374389). +* Thu Jul 17 2008 lmuelle@suse.de +- Update to 3.0.31. + + BUG 5504: Fix SIGTERM handling in Winbind children so that they do not + remove the unix domain socket used to field client requests. + + Split the winbindd_passdb backend into a 'builtin' and a 'sam' backend. + + When allocating client buffers for large read/write - make sure we take + account of the large read/write SMB headers as well as the buffer space. + + Memory leak fixes in DC location code. + + BUG 5533: Winbindd fails to cope correctly with a workgroup name + containing a '.' + + BUG 5555: Don't return NT_STATUS_PASSWORD_MUST_CHANGE error on machine + account logon. + + BUG 5551: smbd recursing back into winbindd from a winbindd call. + + Fix usage message for "net rpc trustdom add". + + Ensure consistent use of pdb_get_nt_passwd instead of pdb_get_lanman_passwd. + + BUG 5578: Bad (non-Samba) use of strlcat gives error. + + Canonicalize servername in the printer functions to remove leading '\\' + characters. + + Documentation build fixes. + + [DOCS] Fix use of smbconfoption in samba.entities. + + Return NULL in sitename_fetch() if gencache_init() fails. + + Use machine account and machine password from our domain when contacting + trusted domains. + + SPNEGO SPN fix when contacting trusted domains. + + BUG 5285: Fix libcap header mismatch. + + Fix joining NT4 domains. + + Don't let winbind getgroups crash when we have no gids in the token. + + Fallback to level 24 pwd set while joining. + + Fix joining w2k domains in "security = ads". + + Fix pam_sm_chauthtok for storing modified cached creds. + + BUG 5202: Re-activate "acl group control" parameter and make it only apply + to owning group. + + BUG 5531: Fix conversion of ns units when converting from nttime to + timespec. + + BUG 4974: Map NT_STATUS_OBJECT_PATH_NOT_FOUND to ENOENT in libsmbclient. + + Fix a segfault in base64_encode_data_blob. + + AIX build fixes. + + ENODATA is not defined in freeBSD 4.6.2. + + Don't reset password last set time just because the expired flag is set to + 0. + + Fix usage message for 'net idmap dump'. + + Miscellaneous man page fixes. + + BUG 4203: Samba3-HOWTO: Add improvements/fixes submitted by Pete Boyd. + + Fixes to man pages. + + Add tdb file documentation. + + Ensure that winbindd trusted domain children keep primary domain online + status up to date. + + Update cached creds during password change. + + Ensure that Winbind always uses set_domain_offline() to mark a domain + offline. + + Allow authentication and memory credential refresh after password change + from gdm/xdm. + + Memory leak fixes. +* Tue Jul 08 2008 boyang@suse.de +- Allow authentication and memory credential refresh after password change + from gdm/xdm. Patch from boyang <boyang@novell.com>. Jeremy; [bnc#395578]. +* Fri Jul 04 2008 lmuelle@suse.de +- Add SMB_VFS_OP_RECVFILE to vfs_op_names to get it in sync with vfs.h. * Wed Jul 02 2008 lmuelle@suse.de - Call the libsmbclient testsuite from the %%check instead of the %%build script. ++++++ build-source-timestamp ++++++ --- samba/build-source-timestamp 2008-07-03 14:36:38.000000000 +0200 +++ /mounts/work_src_done/STABLE/samba/build-source-timestamp 2008-07-25 12:27:47.000000000 +0200 @@ -1,2 +1,2 @@ -1842 +1861 Branch : trunk ++++++ patches.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches/samba.org/11a8f5161184914bec031c741c57bbce19998d2c new/patches/samba.org/11a8f5161184914bec031c741c57bbce19998d2c --- old/patches/samba.org/11a8f5161184914bec031c741c57bbce19998d2c 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/samba.org/11a8f5161184914bec031c741c57bbce19998d2c 2008-07-21 11:25:55.000000000 +0200 @@ -0,0 +1,23 @@ +commit 11a8f5161184914bec031c741c57bbce19998d2c +Author: Bo Yang <boyang@novell.com> +Date: Wed Jul 16 11:11:55 2008 -0400 + + Allow %u parameters for print job username - use advanced sub + +Index: source/printing/printing.c +=================================================================== +--- source/printing/printing.c.orig ++++ source/printing/printing.c +@@ -2438,8 +2438,10 @@ uint32 print_job_start(struct current_us + + if ((vuser = get_valid_user_struct(user->vuid)) != NULL) { + fstrcpy(pjob.user, lp_printjob_username(snum)); +- standard_sub_basic(vuser->user.smb_name, vuser->user.domain, +- pjob.user, sizeof(pjob.user)-1); ++ standard_sub_advanced(sharename, vuser->user.smb_name, path, ++ vuser->gid, vuser->user.smb_name, ++ vuser->user.domain, pjob.user, ++ sizeof(pjob.user) - 1); + /* ensure NULL termination */ + pjob.user[sizeof(pjob.user)-1] = '\0'; + } else { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches/samba.org/567c6def08d91716c687ed43de0938e1556f26e2 new/patches/samba.org/567c6def08d91716c687ed43de0938e1556f26e2 --- old/patches/samba.org/567c6def08d91716c687ed43de0938e1556f26e2 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/samba.org/567c6def08d91716c687ed43de0938e1556f26e2 2008-07-10 11:02:59.000000000 +0200 @@ -0,0 +1,21 @@ +commit 567c6def08d91716c687ed43de0938e1556f26e2 +Author: Lars Mueller <lars@samba.org> +Date: Fri Jul 4 14:51:01 2008 +0200 + + Add SMB_VFS_OP_RECVFILE to get it in sync with vfs.h + + Fix "vfs_full_audit.c: name table not in sync with vfs.h" panic reported + by Franz Sirl. + +diff --git source/modules/vfs_full_audit.c b/source/modules/vfs_full_audit.c +index db933f7..4a66fb4 100644 +--- source/modules/vfs_full_audit.c ++++ source/modules/vfs_full_audit.c +@@ -571,6 +571,7 @@ static struct { + { SMB_VFS_OP_PWRITE, "pwrite" }, + { SMB_VFS_OP_LSEEK, "lseek" }, + { SMB_VFS_OP_SENDFILE, "sendfile" }, ++ { SMB_VFS_OP_RECVFILE, "recvfile" }, + { SMB_VFS_OP_RENAME, "rename" }, + { SMB_VFS_OP_FSYNC, "fsync" }, + { SMB_VFS_OP_STAT, "stat" }, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches/samba.org/63316efeeb330d2cb7fa0906824c97da2c7b0074 new/patches/samba.org/63316efeeb330d2cb7fa0906824c97da2c7b0074 --- old/patches/samba.org/63316efeeb330d2cb7fa0906824c97da2c7b0074 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/samba.org/63316efeeb330d2cb7fa0906824c97da2c7b0074 2008-07-10 11:02:59.000000000 +0200 @@ -0,0 +1,102 @@ +commit 63316efeeb330d2cb7fa0906824c97da2c7b0074 +Author: Jeremy Allison <jra@samba.org> +Date: Mon Jul 7 11:25:57 2008 -0700 + + Allow authentication and memory credential refresh after password change from gdm/xdm. Patch from boyang <boyang@novell.com>. + Jeremy. + +Index: source/nsswitch/pam_winbind.c +=================================================================== +--- source/nsswitch/pam_winbind.c.orig ++++ source/nsswitch/pam_winbind.c +@@ -2384,15 +2384,17 @@ static bool _pam_require_krb5_auth_after + /* Make sure that we only do this if a) the chauthtok got initiated + * during a logon attempt (authenticate->acct_mgmt->chauthtok) b) any + * later password change via the "passwd" command if done by the user +- * itself */ ++ * itself ++ * NB. If we login from gdm or xdm and the password expires, ++ * we change the password, but there is no memory cache. ++ * Thus, even for passthrough login, we should do the ++ * authentication again to update memory cache. ++ * --- BoYang ++ * */ + + char *new_authtok_reqd_during_auth = NULL; + struct passwd *pwd = NULL; + +- if (!(ctx->ctrl & WINBIND_KRB5_AUTH)) { +- return false; +- } +- + _pam_get_data(ctx->pamh, PAM_WINBIND_NEW_AUTHTOK_REQD_DURING_AUTH, + &new_authtok_reqd_during_auth); + pam_set_data(ctx->pamh, PAM_WINBIND_NEW_AUTHTOK_REQD_DURING_AUTH, +@@ -2630,8 +2632,13 @@ int pam_sm_chauthtok(pam_handle_t * pamh + cctype = get_krb5_cc_type_from_config(ctx); + warn_pwd_expire = get_warn_pwd_expire_from_config(ctx); + +- /* clearing offline bit for auth */ +- ctx->ctrl &= ~WINBIND_CACHED_LOGIN; ++ /* Keep WINBIND_CACHED_LOGIN bit for ++ * authentication after changing the password. ++ * This will update the cached credentials in case ++ * that winbindd_dual_pam_chauthtok() fails ++ * to update them. ++ * --- BoYang ++ * */ + + ret = winbind_auth_request(ctx, user, pass_new, + member, cctype, 0, &response, +Index: source/winbindd/winbindd_pam.c +=================================================================== +--- source/winbindd/winbindd_pam.c.orig ++++ source/winbindd/winbindd_pam.c +@@ -2114,11 +2114,21 @@ enum winbindd_result winbindd_dual_pam_c + done: + + if (NT_STATUS_IS_OK(result) && (state->request.flags & WBFLAG_PAM_CACHED_LOGIN)) { +- ++ + /* Update the single sign-on memory creds. */ + result = winbindd_replace_memory_creds(state->request.data.chauthtok.user, + newpass); + ++ /* When we login from gdm or xdm and password expires, ++ * we change password, but there are no memory crendentials ++ * So, winbindd_replace_memory_creds() returns ++ * NT_STATUS_OBJECT_NAME_NOT_FOUND. This is not a failure. ++ * --- BoYang ++ * */ ++ if (NT_STATUS_EQUAL(result, NT_STATUS_OBJECT_NAME_NOT_FOUND)) { ++ result = NT_STATUS_OK; ++ } ++ + if (!NT_STATUS_IS_OK(result)) { + DEBUG(10,("Failed to replace memory creds: %s\n", nt_errstr(result))); + goto process_result; +@@ -2128,12 +2138,23 @@ done: + result = winbindd_update_creds_by_name(contact_domain, + state->mem_ctx, user, + newpass); ++ /* Again, this happens when we login from gdm or xdm ++ * and the password expires, *BUT* cached crendentials ++ * doesn't exist. winbindd_update_creds_by_name() ++ * returns NT_STATUS_NO_SUCH_USER. ++ * This is not a failure. ++ * --- BoYang ++ * */ ++ if (NT_STATUS_EQUAL(result, NT_STATUS_NO_SUCH_USER)) { ++ result = NT_STATUS_OK; ++ } ++ + if (!NT_STATUS_IS_OK(result)) { + DEBUG(10,("Failed to store creds: %s\n", nt_errstr(result))); + goto process_result; + } + } +- } ++ } + + if (!NT_STATUS_IS_OK(result) && !got_info && contact_domain) { + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches/samba.org/cdf10e6ee9faff42693bb39ede535cc6611a8fc9 new/patches/samba.org/cdf10e6ee9faff42693bb39ede535cc6611a8fc9 --- old/patches/samba.org/cdf10e6ee9faff42693bb39ede535cc6611a8fc9 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/samba.org/cdf10e6ee9faff42693bb39ede535cc6611a8fc9 2008-07-25 09:21:10.000000000 +0200 @@ -0,0 +1,28 @@ +commit cdf10e6ee9faff42693bb39ede535cc6611a8fc9 +Author: Andreas Schneider <anschneider@suse.de> +Date: Mon Jul 21 11:52:10 2008 +0200 + + Remove trailing withespace from wbinfo -m which breaks gdm auth. + + Signed-off-by: Andreas Schneider <anschneider@suse.de> + +Index: source/nsswitch/wbinfo.c +=================================================================== +--- source/nsswitch/wbinfo.c.orig ++++ source/nsswitch/wbinfo.c +@@ -359,10 +359,11 @@ static bool wbinfo_list_domains(bool lis + } + + for (i=0; i<num_domains; i++) { +- d_printf("%-16s", domain_list[i].short_name); +- +- if (!print_all) { +- d_printf("\n"); ++ if (print_all) { ++ d_printf("%-16s", domain_list[i].short_name); ++ } else { ++ d_printf("%s", domain_list[i].short_name); ++ d_printf("\n"); + continue; + } + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches/series new/patches/series --- old/patches/series 2008-07-03 12:55:19.000000000 +0200 +++ new/patches/series 2008-07-25 09:21:07.000000000 +0200 @@ -5,7 +5,10 @@ # allows quilt to work in the usual way (= outside of our RPM spec file). # Samba patches from upstream, svnanon.Samba.org - +samba.org/567c6def08d91716c687ed43de0938e1556f26e2 -p0 +samba.org/63316efeeb330d2cb7fa0906824c97da2c7b0074 -p0 # bnc 395578 +samba.org/11a8f5161184914bec031c741c57bbce19998d2c -p0 # bnc 374389 +samba.org/cdf10e6ee9faff42693bb39ede535cc6611a8fc9 -p0 # SuSE specific changes # disabled -> WIP lmuelle ++++++ vendor-files.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vendor-files/mkinitrd/mkinitrd-boot.sh new/vendor-files/mkinitrd/mkinitrd-boot.sh --- old/vendor-files/mkinitrd/mkinitrd-boot.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/vendor-files/mkinitrd/mkinitrd-boot.sh 2008-07-23 16:22:15.000000000 +0200 @@ -0,0 +1,50 @@ +#!/bin/bash +#%stage: block +#%modules: cifs +#%programs: /sbin/mount.cifs +#%if: "$rootfstype" = "cifs" +# +##### CIFS support +## +## This is where CIFS gets mounted. +## +## Command line parameters +## ----------------------- +## +## root=cifs://[user:pass@]<server>/<folder> the cifs root path +## cifsuser=<username> (only used if not defined in root=) +## cifspass=<password> (only used if not defined in root=) +## + +if [ "$rootfstype" = "cifs" ]; then + # load the cifs module before using it + load_modules + + if [ "${rootdev%%://*}" = "cifs" ]; then # URL parsing + rootdev=${rootdev##cifs://} + username=${rootdev%@*} + password=${username#*:} + if [ "$password" ]; then + cifspass=$password + username=${username%:*} + fi + cifsuser=$username + if [ "$username" ]; then + rootdev="${rootdev#*@}" + fi + rootdev="//$rootdev" + fi + + rootfsmod= + if [ ! "$cifsuser" -o ! "$cifspass" ]; then + echo "For CIFS support you need to specify a username and password either in the cifsuser and cifspass commandline parameters or in the root= CIFS URL." + fi + if [ "$rootflags" ] ; then + rootflags="${rootflags},user=$cifsuser" + else + rootflags="user=$cifsuser" + fi + rootflags="$rootflags,pass=$cifspass" +else + dont_load_modules +fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vendor-files/mkinitrd/mkinitrd-setup.sh new/vendor-files/mkinitrd/mkinitrd-setup.sh --- old/vendor-files/mkinitrd/mkinitrd-setup.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/vendor-files/mkinitrd/mkinitrd-setup.sh 2008-07-23 16:22:24.000000000 +0200 @@ -0,0 +1,9 @@ +#!/bin/bash +# +#%stage: device +# + +if [ "$rootfstype" = "cifs" ]; then + interface=default + save_var rootfstype +fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vendor-files/tools/package-data new/vendor-files/tools/package-data --- old/vendor-files/tools/package-data 2008-07-03 14:36:38.000000000 +0200 +++ new/vendor-files/tools/package-data 2008-07-25 12:27:46.000000000 +0200 @@ -1,2 +1,2 @@ # This is an autogenrated file. -SAMBA_PACKAGE_SVN_VERSION="1842" +SAMBA_PACKAGE_SVN_VERSION="1861" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org