commit samba for openSUSE:Factory
Hello community, here is the log from the commit of package samba for openSUSE:Factory checked in at Mon Mar 9 00:29:06 CET 2009. -------- --- samba/samba.changes 2009-02-08 14:05:56.000000000 +0100 +++ /mounts/work_src_done/STABLE/samba/samba.changes 2009-03-06 14:22:02.000000000 +0100 @@ -1,0 +2,20 @@ +Thu Mar 5 16:07:10 CET 2009 - ro@suse.de + +- Ignore return value from subshell to fix build. + +------------------------------------------------------------------- +Wed Feb 25 09:24:25 CET 2009 - boyang@suse.de + +- Make libsmbclient work with DFS, backported from 3.3; (bnc#475995). + +------------------------------------------------------------------- +Mon Feb 23 17:35:25 CET 2009 - hhetter@suse.de + +- Define init_samba_module in all samba-vscan modules; (bnc#469218). + +------------------------------------------------------------------- +Mon Feb 9 15:53:40 CET 2009 - jmcdonough@suse.de + +- Revert accidental partial strict allocate upstream commit + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ samba-doc.spec ++++++ --- /var/tmp/diff_new_pack.gWb675/_old 2009-03-09 00:28:37.000000000 +0100 +++ /var/tmp/diff_new_pack.gWb675/_new 2009-03-09 00:28:37.000000000 +0100 @@ -26,7 +26,7 @@ License: GPL v3 or later Url: http://www.samba.org/ Version: 3.2.8 -Release: 1 +Release: 3 Summary: Samba Documentation Group: Documentation/Other AutoReqProv: on @@ -322,7 +322,7 @@ -------- The Samba Team <samba@samba.org> -Source Timestamp: 2055 +Source Timestamp: 2082 Branch : 3.2.8 %changelog ++++++ samba.spec ++++++ --- /var/tmp/diff_new_pack.gWb675/_old 2009-03-09 00:28:37.000000000 +0100 +++ /var/tmp/diff_new_pack.gWb675/_new 2009-03-09 00:28:37.000000000 +0100 @@ -51,7 +51,7 @@ Url: http://www.samba.org/ AutoReqProv: on Version: 3.2.8 -Release: 1 +Release: 3 %ifarch ppc64 Obsoletes: samba-64bit %endif @@ -134,7 +134,7 @@ -------- The Samba Team <samba@samba.org> -Source Timestamp: 2055 +Source Timestamp: 2082 Branch : 3.2.8 %package client @@ -174,7 +174,7 @@ -------- The Samba Team <samba@samba.org> -Source Timestamp: 2055 +Source Timestamp: 2082 Branch : 3.2.8 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -198,7 +198,7 @@ -------- The Samba Team <samba@samba.org> -Source Timestamp: 2055 +Source Timestamp: 2082 Branch : 3.2.8 %endif @@ -228,7 +228,7 @@ -------- The Samba Team <samba@samba.org> -Source Timestamp: 2055 +Source Timestamp: 2082 Branch : 3.2.8 %endif @@ -255,7 +255,7 @@ -------- Jeremy Allison <jra at samba dot org> -Source Timestamp: 2055 +Source Timestamp: 2082 Branch : 3.2.8 %if %{make_utils} @@ -304,7 +304,7 @@ -------- The Samba Team <samba@samba.org> -Source Timestamp: 2055 +Source Timestamp: 2082 Branch : 3.2.8 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -342,7 +342,7 @@ -------- The Samba Team <samba@samba.org> -Source Timestamp: 2055 +Source Timestamp: 2082 Branch : 3.2.8 %else @@ -356,7 +356,7 @@ -------- The Samba Team <samba@samba.org> -Source Timestamp: 2055 +Source Timestamp: 2082 Branch : 3.2.8 %endif @@ -390,7 +390,7 @@ -------- The Samba Team <samba@samba.org> -Source Timestamp: 2055 +Source Timestamp: 2082 Branch : 3.2.8 %package -n libnetapi0 @@ -409,7 +409,7 @@ -------- The Samba Team <samba@samba.org> -Source Timestamp: 2055 +Source Timestamp: 2082 Branch : 3.2.8 %package -n libnetapi-devel @@ -429,7 +429,7 @@ -------- The Samba Team <samba@samba.org> -Source Timestamp: 2055 +Source Timestamp: 2082 Branch : 3.2.8 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -456,7 +456,7 @@ -------- The Samba Team <samba@samba.org> -Source Timestamp: 2055 +Source Timestamp: 2082 Branch : 3.2.8 %else @@ -470,7 +470,7 @@ -------- The Samba Team <samba@samba.org> -Source Timestamp: 2055 +Source Timestamp: 2082 Branch : 3.2.8 %endif @@ -501,7 +501,7 @@ -------- The Samba Team <samba@samba.org> -Source Timestamp: 2055 +Source Timestamp: 2082 Branch : 3.2.8 %if %{make_ldapsmb} @@ -522,7 +522,7 @@ -------- The Samba Team <samba@samba.org> -Source Timestamp: 2055 +Source Timestamp: 2082 Branch : 3.2.8 %package -n libtalloc-devel @@ -542,7 +542,7 @@ -------- The Samba Team <samba@samba.org> -Source Timestamp: 2055 +Source Timestamp: 2082 Branch : 3.2.8 %package -n libtdb1 @@ -561,7 +561,7 @@ -------- The Samba Team <samba@samba.org> -Source Timestamp: 2055 +Source Timestamp: 2082 Branch : 3.2.8 %package -n libtdb-devel @@ -581,7 +581,7 @@ -------- The Samba Team <samba@samba.org> -Source Timestamp: 2055 +Source Timestamp: 2082 Branch : 3.2.8 %package -n libwbclient0 @@ -600,7 +600,7 @@ -------- The Samba Team <samba@samba.org> -Source Timestamp: 2055 +Source Timestamp: 2082 Branch : 3.2.8 %package -n libwbclient-devel @@ -620,7 +620,7 @@ -------- The Samba Team <samba@samba.org> -Source Timestamp: 2055 +Source Timestamp: 2082 Branch : 3.2.8 %package -n ldapsmb @@ -629,7 +629,7 @@ Group: Productivity/Networking/Samba AutoReqProv: on Version: 1.34b -Release: 256 +Release: 259 Requires: perl-ldap %description -n ldapsmb @@ -642,7 +642,7 @@ -------- Guenther Deschner <guenther at deschner dot de> -Source Timestamp: 2055 +Source Timestamp: 2082 Branch : 3.2.8 %endif @@ -666,7 +666,7 @@ -------- Steve French <sfrench at Samba dot org> -Source Timestamp: 2055 +Source Timestamp: 2082 Branch : 3.2.8 %endif @@ -678,7 +678,7 @@ Group: Productivity/Networking/Samba AutoReqProv: on Version: 0.3.6b -Release: 260 +Release: 263 Provides: samba3-vscan = 0.3.6b Obsoletes: samba3-vscan Requires: samba = %{samba_ver} @@ -696,7 +696,7 @@ -------- Rainer Link <rainer@openantivirus.org> -Source Timestamp: 2055 +Source Timestamp: 2082 Branch : 3.2.8 %endif @@ -1070,7 +1070,7 @@ VFS="${RPM_BUILD_DIR}/samba-%{samba_ver_full}/examples/VFS" VSCAN="$VFS/samba-vscan-%{vscan_ver}" dirs="$SAM $VFS" -(for i in $dirs; do make -C "${i}" clean; done) +(for i in $dirs; do make -C "${i}" clean; done) || true # add docs %if %{make_vscan} mv examples/VFS/samba-vscan-%{vscan_ver} . @@ -1695,6 +1695,14 @@ %endif %changelog +* Thu Mar 05 2009 ro@suse.de +- Ignore return value from subshell to fix build. +* Wed Feb 25 2009 boyang@suse.de +- Make libsmbclient work with DFS, backported from 3.3; (bnc#475995). +* Mon Feb 23 2009 hhetter@suse.de +- Define init_samba_module in all samba-vscan modules; (bnc#469218). +* Mon Feb 09 2009 jmcdonough@suse.de +- Revert accidental partial strict allocate upstream commit * Sun Feb 08 2009 jmcdonough@suse.de - Update to 3.2.8. + Fix and streamline join and DC detection ++++++ build-source-timestamp ++++++ --- /var/tmp/diff_new_pack.gWb675/_old 2009-03-09 00:28:37.000000000 +0100 +++ /var/tmp/diff_new_pack.gWb675/_new 2009-03-09 00:28:37.000000000 +0100 @@ -1,2 +1,2 @@ -2055 +2082 Branch : 3.2.8 ++++++ patches.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches/series new/patches/series --- old/patches/series 2009-02-08 12:35:23.000000000 +0100 +++ new/patches/series 2009-03-04 23:23:03.000000000 +0100 @@ -18,6 +18,7 @@ suse/Makefile.in-libwbclient_static.diff -p0 # create static lib too suse/net-kdc-lookup.diff -p0 # perform dns-only lookup for kdcs suse/configure.diff -p0 # Work around bad use of autoconf interna +suse/libsmbclient-dfs.diff -p0 #bnc 475995 # this one should always live at the end and should be redone # diabled cf. 280452 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches/suse/libsmbclient-dfs.diff new/patches/suse/libsmbclient-dfs.diff --- old/patches/suse/libsmbclient-dfs.diff 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/suse/libsmbclient-dfs.diff 2009-03-04 23:23:03.000000000 +0100 @@ -0,0 +1,323 @@ +From b26d00a3ab498f30336c1fc9db02515aecc1a607 Mon Sep 17 00:00:00 2001 +From: Bo Yang <boyang@novell.com> +Date: Fri, 20 Feb 2009 12:47:55 +0800 +Subject: [PATCH] Make libsmbclient work with DFS + +--- + source/include/libsmbclient.h | 39 +++++++++++++++++++++++++++ + source/lib/util.c | 5 +++ + source/libsmb/libsmb_context.c | 57 ++++++++++++++++++++++++++++++++++++++++ + source/libsmb/libsmb_dir.c | 27 +++++++++++++++++- + source/libsmb/libsmb_file.c | 2 +- + source/libsmb/libsmb_path.c | 15 ++++++++++- + source/libsmb/libsmb_server.c | 19 ++++++++++++- + source/libsmb/libsmb_stat.c | 2 +- + 8 files changed, 160 insertions(+), 6 deletions(-) + +Index: source/include/libsmbclient.h +=================================================================== +--- source/include/libsmbclient.h.orig ++++ source/include/libsmbclient.h +@@ -2561,6 +2561,45 @@ smbc_version(void); + } + #endif + ++/**@ingroup misc ++ * Set the users credentials globally so they can be used for DFS ++ * referrals. Probably best to use this function in the smbc_get_auth_data_fn ++ * callback. ++ * ++ * @param workgroup Workgroup of the user. ++ * ++ * @param user Username of user. ++ * ++ * @param password Password of user. ++ * ++ * @param use_kerberos Whether to use Kerberos ++ * ++ * @param signing_state One of these strings (all equivalents on same line): ++ * "off", "no", "false" ++ * "on", "yes", "true", "auto" ++ * "force", "required", "forced" ++ */ ++ ++void ++smbc_set_credentials(char *workgroup, ++ char *user, ++ char *password, ++ smbc_bool use_kerberos, ++ char *signing_state); ++ ++/* ++ * Wrapper around smbc_set_credentials. ++ * Used to set correct credentials that will ++ * be used to connect to DFS target share ++ * in libsmbclient ++ */ ++ ++void ++smbc_set_credentials_with_fallback(SMBCCTX *ctx, ++ char *workgroup, ++ char *user, ++ char *password); ++ + /** + * @ingroup structure + * Structure that contains a client context information +Index: source/lib/util.c +=================================================================== +--- source/lib/util.c.orig ++++ source/lib/util.c +@@ -350,6 +350,11 @@ int get_cmdline_auth_info_signing_state( + return cmdline_auth_info.signing_state; + } + ++void set_cmdline_auth_info_use_kerberos(bool b) ++{ ++ cmdline_auth_info.use_kerberos = b; ++} ++ + bool get_cmdline_auth_info_use_kerberos(void) + { + return cmdline_auth_info.use_kerberos; +Index: source/libsmb/libsmb_context.c +=================================================================== +--- source/libsmb/libsmb_context.c.orig ++++ source/libsmb/libsmb_context.c +@@ -623,3 +623,60 @@ smbc_version(void) + } + + ++/* ++ * Set the credentials so DFS will work when following referrals. ++ */ ++void ++smbc_set_credentials(char *workgroup, ++ char *user, ++ char *password, ++ smbc_bool use_kerberos, ++ char *signing_state) ++{ ++ ++ set_cmdline_auth_info_username(user); ++ set_cmdline_auth_info_password(password); ++ set_cmdline_auth_info_use_kerberos(use_kerberos); ++ if (! set_cmdline_auth_info_signing_state(signing_state)) { ++ DEBUG(0, ("Invalid signing state: %s", signing_state)); ++ } ++ set_global_myworkgroup(workgroup); ++ cli_cm_set_credentials(); ++} ++ ++void smbc_set_credentials_with_fallback(SMBCCTX *context, ++ char *workgroup, ++ char *user, ++ char *password) ++{ ++ smbc_bool use_kerberos = false; ++ const char *signing_state = "off"; ++ ++ if (!context || !workgroup || !*workgroup ++ || !user || !*user || !password ++ || !*password) { ++ return; ++ } ++ ++ if (smbc_getOptionUseKerberos(context)) { ++ use_kerberos = True; ++ } ++ ++ if (lp_client_signing()) { ++ signing_state = "on"; ++ } ++ ++ if (lp_client_signing() == Required) { ++ signing_state = "force"; ++ } ++ ++ smbc_set_credentials(workgroup, ++ user, ++ password, ++ use_kerberos, ++ (char *)signing_state); ++ ++ if (smbc_getOptionFallbackAfterKerberos(context)) { ++ cli_cm_set_fallback_after_kerberos(); ++ } ++} +Index: source/libsmb/libsmb_dir.c +=================================================================== +--- source/libsmb/libsmb_dir.c.orig ++++ source/libsmb/libsmb_dir.c +@@ -1502,6 +1502,8 @@ SMBC_chmod_ctx(SMBCCTX *context, + char *user = NULL; + char *password = NULL; + char *workgroup = NULL; ++ char *targetpath = NULL; ++ struct cli_state *targetcli = NULL; + char *path = NULL; + uint16 mode; + TALLOC_CTX *frame = talloc_stackframe(); +@@ -1552,6 +1554,14 @@ SMBC_chmod_ctx(SMBCCTX *context, + TALLOC_FREE(frame); + return -1; /* errno set by SMBC_server */ + } ++ ++ /*d_printf(">>>unlink: resolving %s\n", path);*/ ++ if (!cli_resolve_path(frame, "", srv->cli, path, ++ &targetcli, &targetpath)) { ++ d_printf("Could not resolve %s\n", path); ++ TALLOC_FREE(frame); ++ return -1; ++ } + + mode = 0; + +@@ -1560,8 +1570,8 @@ SMBC_chmod_ctx(SMBCCTX *context, + if ((newmode & S_IXGRP) && lp_map_system(-1)) mode |= aSYSTEM; + if ((newmode & S_IXOTH) && lp_map_hidden(-1)) mode |= aHIDDEN; + +- if (!cli_setatr(srv->cli, path, mode, 0)) { +- errno = SMBC_errno(context, srv->cli); ++ if (!cli_setatr(targetcli, targetpath, mode, 0)) { ++ errno = SMBC_errno(context, targetcli); + TALLOC_FREE(frame); + return -1; + } +@@ -1902,6 +1912,12 @@ SMBC_rename_ctx(SMBCCTX *ocontext, + + } + ++ /* set the credentials to make DFS work */ ++ smbc_set_credentials_with_fallback(ocontext, ++ workgroup, ++ user1, ++ password1); ++ + /*d_printf(">>>rename: resolving %s\n", path1);*/ + if (!cli_resolve_path(frame, "", srv->cli, path1, + &targetcli1, &targetpath1)) { +@@ -1909,6 +1925,13 @@ SMBC_rename_ctx(SMBCCTX *ocontext, + TALLOC_FREE(frame); + return -1; + } ++ ++ /* set the credentials to make DFS work */ ++ smbc_set_credentials_with_fallback(ncontext, ++ workgroup, ++ user2, ++ password2); ++ + /*d_printf(">>>rename: resolved path as %s\n", targetpath1);*/ + /*d_printf(">>>rename: resolving %s\n", path2);*/ + if (!cli_resolve_path(frame, "", srv->cli, path2, +Index: source/libsmb/libsmb_file.c +=================================================================== +--- source/libsmb/libsmb_file.c.orig ++++ source/libsmb/libsmb_file.c +@@ -382,7 +382,7 @@ SMBC_write_ctx(SMBCCTX *context, + TALLOC_FREE(frame); + return -1; + } +- ++ + /*d_printf(">>>write: resolving %s\n", path);*/ + if (!cli_resolve_path(frame, "", file->srv->cli, path, + &targetcli, &targetpath)) { +Index: source/libsmb/libsmb_path.c +=================================================================== +--- source/libsmb/libsmb_path.c.orig ++++ source/libsmb/libsmb_path.c +@@ -233,6 +233,7 @@ SMBC_parse_path(TALLOC_CTX *ctx, + char *s; + const char *p; + char *q, *r; ++ char *workgroup = NULL; + int len; + + /* Ensure these returns are at least valid pointers. */ +@@ -332,7 +333,6 @@ SMBC_parse_path(TALLOC_CTX *ctx, + u = userinfo; + + if (strchr_m(u, ';')) { +- char *workgroup; + next_token_no_ltrim_talloc(ctx, &u, &workgroup, ";"); + if (!workgroup) { + return -1; +@@ -394,6 +394,19 @@ decoding: + (void) urldecode_talloc(ctx, pp_share, *pp_share); + (void) urldecode_talloc(ctx, pp_user, *pp_user); + (void) urldecode_talloc(ctx, pp_password, *pp_password); ++ ++ if (!workgroup) { ++ workgroup = talloc_strdup(ctx, smbc_getWorkgroup(context)); ++ } ++ if (!workgroup) { ++ return -1; ++ } ++ ++ /* set the credentials to make DFS work */ ++ smbc_set_credentials_with_fallback(context, ++ workgroup, ++ *pp_user, ++ *pp_password); + + return 0; + } +Index: source/libsmb/libsmb_server.c +=================================================================== +--- source/libsmb/libsmb_server.c.orig ++++ source/libsmb/libsmb_server.c +@@ -238,6 +238,7 @@ SMBC_server(TALLOC_CTX *ctx, + char **pp_password) + { + SMBCSRV *srv=NULL; ++ char *workgroup = NULL; + struct cli_state *c; + struct nmb_name called, calling; + const char *server_n = server; +@@ -325,7 +326,7 @@ SMBC_server(TALLOC_CTX *ctx, + if (srv) { + + /* ... then we're done here. Give 'em what they came for. */ +- return srv; ++ goto done; + } + + /* If we're not asked to connect when a connection doesn't exist... */ +@@ -536,6 +537,22 @@ again: + server, share, srv)); + + DLIST_ADD(context->internal->servers, srv); ++done: ++ if (!pp_workgroup || !*pp_workgroup || !**pp_workgroup) { ++ workgroup = talloc_strdup(ctx, smbc_getWorkgroup(context)); ++ } else { ++ workgroup = *pp_workgroup; ++ } ++ if(!workgroup) { ++ return NULL; ++ } ++ ++ /* set the credentials to make DFS work */ ++ smbc_set_credentials_with_fallback(context, ++ workgroup, ++ *pp_username, ++ *pp_password); ++ + return srv; + + failed: +Index: source/libsmb/libsmb_stat.c +=================================================================== +--- source/libsmb/libsmb_stat.c.orig ++++ source/libsmb/libsmb_stat.c +@@ -155,7 +155,7 @@ SMBC_stat_ctx(SMBCCTX *context, + TALLOC_FREE(frame); + return -1; + } +- ++ + if (!user || user[0] == (char)0) { + user = talloc_strdup(frame, smbc_getUser(context)); + if (!user) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches/vscan/series new/patches/vscan/series --- old/patches/vscan/series 2009-02-08 11:59:11.000000000 +0100 +++ new/patches/vscan/series 2009-03-04 22:30:55.000000000 +0100 @@ -6,3 +6,4 @@ SMB_VFS_NEXT_CLOSE-args.diff -p0 pm_process_additional_fourth_arg.diff -p0 Makefile.in.diff -p0 +use-init_samba_module.diff -p0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches/vscan/use-init_samba_module.diff new/patches/vscan/use-init_samba_module.diff --- old/patches/vscan/use-init_samba_module.diff 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/vscan/use-init_samba_module.diff 2009-03-04 22:30:55.000000000 +0100 @@ -0,0 +1,156 @@ +Index: antivir/vscan-antivir.c +=================================================================== +--- antivir/vscan-antivir.c.orig ++++ antivir/vscan-antivir.c +@@ -519,7 +519,7 @@ static int vscan_close(struct files_stru + + #if (SMB_VFS_INTERFACE_VERSION >= 6) + /* Samba 3.0 */ +-NTSTATUS init_module(void) ++NTSTATUS init_samba_module(void) + { + NTSTATUS ret; + +Index: clamav/vscan-clamav.c +=================================================================== +--- clamav/vscan-clamav.c.orig ++++ clamav/vscan-clamav.c +@@ -513,7 +513,7 @@ static int vscan_close(struct files_stru + + #if (SMB_VFS_INTERFACE_VERSION >= 6) + /* Samba 3.0 */ +-NTSTATUS init_module(void) ++NTSTATUS init_samba_module(void) + { + NTSTATUS ret; + +Index: f-secure/vscan-fsav.c +=================================================================== +--- f-secure/vscan-fsav.c.orig ++++ f-secure/vscan-fsav.c +@@ -583,7 +583,7 @@ static int vscan_close(struct files_stru + + #if (SMB_VFS_INTERFACE_VERSION >= 6) + /* Samba 3.0 */ +-NTSTATUS init_module(void) ++NTSTATUS init_samba_module(void) + { + NTSTATUS ret; + +Index: fprot/vscan-fprotd.c +=================================================================== +--- fprot/vscan-fprotd.c.orig ++++ fprot/vscan-fprotd.c +@@ -469,7 +469,7 @@ static int vscan_close(struct files_stru + + #if (SMB_VFS_INTERFACE_VERSION >= 6) + /* Samba 3.0 */ +-NTSTATUS init_module(void) ++NTSTATUS init_samba_module(void) + { + NTSTATUS ret; + +Index: icap/vscan-icap.c +=================================================================== +--- icap/vscan-icap.c.orig ++++ icap/vscan-icap.c +@@ -467,7 +467,7 @@ static int vscan_close(struct files_stru + + #if (SMB_VFS_INTERFACE_VERSION >= 6) + /* Samba 3.0 */ +-NTSTATUS init_module(void) ++NTSTATUS init_samba_module(void) + { + NTSTATUS ret; + +Index: kaspersky/vscan-kavp.c +=================================================================== +--- kaspersky/vscan-kavp.c.orig ++++ kaspersky/vscan-kavp.c +@@ -485,7 +485,7 @@ static int vscan_close(struct files_stru + + #if (SMB_VFS_INTERFACE_VERSION >= 6) + /* Samba 3.0 */ +-NTSTATUS init_module(void) ++NTSTATUS init_samba_module(void) + { + NTSTATUS ret; + +Index: mks/vscan-mksd.c +=================================================================== +--- mks/vscan-mksd.c.orig ++++ mks/vscan-mksd.c +@@ -449,7 +449,7 @@ static int vscan_close(struct files_stru + + #if (SMB_VFS_INTERFACE_VERSION >= 6) + /* Samba 3.0 */ +-NTSTATUS init_module(void) ++NTSTATUS init_samba_module(void) + { + NTSTATUS ret; + +Index: nai/vscan-mcdaemon.c +=================================================================== +--- nai/vscan-mcdaemon.c.orig ++++ nai/vscan-mcdaemon.c +@@ -457,7 +457,7 @@ static int vscan_close(struct files_stru + + #if (SMB_VFS_INTERFACE_VERSION >= 6) + /* Samba 3.0 */ +-NTSTATUS init_module(void) ++NTSTATUS init_samba_module(void) + { + NTSTATUS ret; + +Index: openantivirus/vscan-oav.c +=================================================================== +--- openantivirus/vscan-oav.c.orig ++++ openantivirus/vscan-oav.c +@@ -467,7 +467,7 @@ static int vscan_close(struct files_stru + + #if (SMB_VFS_INTERFACE_VERSION >= 6) + /* Samba 3.0 */ +-NTSTATUS init_module(void) ++NTSTATUS init_samba_module(void) + { + NTSTATUS ret; + +Index: sophos/vscan-sophos.c +=================================================================== +--- sophos/vscan-sophos.c.orig ++++ sophos/vscan-sophos.c +@@ -455,7 +455,7 @@ static int vscan_close(struct files_stru + + #if (SMB_VFS_INTERFACE_VERSION >= 6) + /* Samba 3.0 */ +-NTSTATUS init_module(void) ++NTSTATUS init_samba_module(void) + { + NTSTATUS ret; + +Index: symantec/vscan-symantec.c +=================================================================== +--- symantec/vscan-symantec.c.orig ++++ symantec/vscan-symantec.c +@@ -443,7 +443,7 @@ static int vscan_close(struct files_stru + + #if (SMB_VFS_INTERFACE_VERSION >= 6) + /* Samba 3.0 */ +-NTSTATUS init_module(void) ++NTSTATUS init_samba_module(void) + { + NTSTATUS ret; + +Index: trend/vscan-trend.c +=================================================================== +--- trend/vscan-trend.c.orig ++++ trend/vscan-trend.c +@@ -462,7 +462,7 @@ static int vscan_close(struct files_stru + + #if (SMB_VFS_INTERFACE_VERSION >= 6) + /* Samba 3.0 */ +-NTSTATUS init_module(void) ++NTSTATUS init_samba_module(void) + { + NTSTATUS ret; + ++++++ vendor-files.tar.bz2 ++++++ 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 2009-02-08 14:08:07.000000000 +0100 +++ new/vendor-files/tools/package-data 2009-03-06 14:19:47.000000000 +0100 @@ -1,2 +1,2 @@ # This is an autogenrated file. -SAMBA_PACKAGE_SVN_VERSION="2055" +SAMBA_PACKAGE_SVN_VERSION="2082" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de