Re: [Samba] nfs4 with Samba 4 [solved]
On 01/31/2012 05:13 PM, steve wrote: On 01/29/2012 10:20 AM, steve wrote: On 29/01/12 08:17, steve wrote: On 29/01/12 07:32, Gémes Géza wrote: 2012-01-28 21:44 keltezéssel, steve írta: On 28/01/12 20:29, Gémes Géza wrote: 2012-01-28 18:41 keltezéssel, steve írta: On 28/01/12 12:21, steve wrote: On 28/01/12 11:03, Gémes Géza wrote: As the nfs4 is writeable without the krb5, that's why I thought it may be related to the S4 Kerbreros. Thanks for your patience, Steve Unfortunately I can't be of real help here (I don't remember anything similar from when I was using nfs4 with krb5) and it seems to be very nfs4 specific, the kerberos (samba4) part has done its job (obtaining machine ticket at mount time, and user ticket when you cd-ed into the mount. What goes on from then is nfs4s own business :-( . I would suggest to ask for help at (I don't know if there is one :-( ) a nfs4 mailing list/forum.Good Luck! Regards Geza Hi Thanks for the confirmation. There is a nfs list: linux-...@vger.kernel.org It's a high tension version of samba-technical, and there is a three headed dog guarding its entrance, but I've been courageous enough to subscribe and post there. Maybe they'll suggest I use cifs! Cheers, Steve Let's see if openSUSE can help. Must be worth a try. https://bugzilla.novell.com/show_bug.cgi?id=743976 Cheers, Steve It _must_ be a bug in openSUSE. I worked through the nfs4 stuff with Ubuntu 11.10 and it worked fine. Kerberized mounts, the lot. It looks like this: http://linuxcostablanca.blogspot.com/2012/01/important-samba-4-update.html Cheers, Steve /etc/idmapd.conf must contain Domain=your.domain NOT the fqdn, the short hostname nor the domain you specified when provisioning Samba. Duh! Cheers, Steve -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] samba 4 PAM and xscreensaver
On 01/09/2012 08:42 AM, steve wrote: Hi I have a Linux client running XFCE and authenticating against Samba 4. When trying to return to the session after xscreensaver has kicked in, authentication fails. Sorry to bump, but I've just seen this in the xscreensaver doco: XScreenSaver Dependencies Required snip Optional libjpeg-8c, libgnome-2.32.1, GLE, Netpbm, XDaliClock, Linux-PAM-1.1.5, _MIT Kerberos V5-1.6 (built with Kerberos V4 backwards compatibility), and krb4 and Heimdal-1.4 (Kerberos authentication requires having Kerberos V4 and V5 on the system)_ Does Samba 4 have this? Cheers, Steve -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] samba 4 PAM and xscreensaver
2012-02-01 19:07 keltezéssel, steve írta: On 01/09/2012 08:42 AM, steve wrote: Hi I have a Linux client running XFCE and authenticating against Samba 4. When trying to return to the session after xscreensaver has kicked in, authentication fails. Sorry to bump, but I've just seen this in the xscreensaver doco: XScreenSaver Dependencies Required snip Optional libjpeg-8c, libgnome-2.32.1, GLE, Netpbm, XDaliClock, Linux-PAM-1.1.5, _MIT Kerberos V5-1.6 (built with Kerberos V4 backwards compatibility), and krb4 and Heimdal-1.4 (Kerberos authentication requires having Kerberos V4 and V5 on the system)_ Does Samba 4 have this? Cheers, Steve Not in a form required by xscreensaver or any other program requiring kerberos library. You should install those libraries (I doubt you really need krb4 nowadays) Regards Geza -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] ongoing printer issues
So I continue to work through the various printing issues I've had with Samba. Hopefully the indexing of my messages will prove useful to others :) Anyway, while my previous fixes have gotten us printing for the most part, we still experience random issues (mostly with PDF printing to certain printers and printing from speciality programs). Anyway, our current issue is as such. User can print from Word/Outlook/Firefox/etc just fine. User prints from speciality program to same printer (as word/etc) and it does not print. Samba reports (at log level 3) a slew of stuff, the most unusual part though is [2012/02/01 16:43:55.319563, 3] smbd/error.c:81(error_packet_set) error packet at smbd/ipc.c(137) cmd=37 (SMBtrans) STATUS_BUFFER_OVERFLOW I should note that this is a Win7 64bit system printing to 3.6.3 I've found some posts on the 'net relating to regressions in samba and 64bit clients, but I was hoping if anyone had some other suggestions. Many thanks! Tom -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] ongoing printer issues
On Wed, Feb 01, 2012 at 09:54:35PM +, Tom Ryan wrote: So I continue to work through the various printing issues I've had with Samba. Hopefully the indexing of my messages will prove useful to others :) Anyway, while my previous fixes have gotten us printing for the most part, we still experience random issues (mostly with PDF printing to certain printers and printing from speciality programs). Anyway, our current issue is as such. User can print from Word/Outlook/Firefox/etc just fine. User prints from speciality program to same printer (as word/etc) and it does not print. Samba reports (at log level 3) a slew of stuff, the most unusual part though is [2012/02/01 16:43:55.319563, 3] smbd/error.c:81(error_packet_set) error packet at smbd/ipc.c(137) cmd=37 (SMBtrans) STATUS_BUFFER_OVERFLOW I should note that this is a Win7 64bit system printing to 3.6.3 I've found some posts on the 'net relating to regressions in samba and 64bit clients, but I was hoping if anyone had some other suggestions. Please get a debug level 10 log of this error and open a bug at bugzilla.samba.org. Thanks ! Jeremy. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Samba logins disconnect?
I have been chasing down a problem where PC logins to our Samba server get disconnected from their printer and file shares. Here is the sequence of events: User logs in to PC File shares from NetApp file server are mapped and mounted Printer shares from Samba server go into opening state, may or may not become Ready Later, mapped network drives are Disconnected Network Drives and printers may report Ready but printing fails Opening a mapped network drive brings it out of Disconnected state but but it will go back to Disconnected after a few minutes Opening a printer window from Printers and Faxes may re-initialize the printer but may not Here's our environment: server room: Samba 3.0.21 NetApp Release 7.3.4 file server client networks: Winows XP clients IPsec tunnel (running on pfSense 2.0 firewalls) connects server room to client networks I haven't been able to find anything helpful in web searches, although there are a number of hits on similar problems. Carl G. Riches IT Manager Department of Biostatistics Box 357232 voice: 206-616-2725 University of Washingtonfax: 206-543-3286 Seattle, WA 98195-7232 internet: c...@u.washington.edu -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Samba logins disconnect?
On Wed, Feb 01, 2012 at 03:31:19PM -0800, Carl G. Riches wrote: I have been chasing down a problem where PC logins to our Samba server get disconnected from their printer and file shares. Here is the sequence of events: User logs in to PC File shares from NetApp file server are mapped and mounted Printer shares from Samba server go into opening state, may or may not become Ready Later, mapped network drives are Disconnected Network Drives and printers may report Ready but printing fails Opening a mapped network drive brings it out of Disconnected state but but it will go back to Disconnected after a few minutes Opening a printer window from Printers and Faxes may re-initialize the printer but may not Here's our environment: server room: Samba 3.0.21 NetApp Release 7.3.4 file server client networks: Winows XP clients IPsec tunnel (running on pfSense 2.0 firewalls) connects server room to client networks I haven't been able to find anything helpful in web searches, although there are a number of hits on similar problems. This is a very old and unsupported version of Samba. Is there a chance you can test with a newer version ? Jeremy. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 6ba09e0 s3:smbd:smb2: fix an assignment-instead-of-check bug
conn_snum_used()
from 204c075 Revert s4-drs: do not try to contact for replication
servers that are not anymore in reps*
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 6ba09e039e4efee33ce6b8cd9f919409656c2afb
Author: Michael Adam ob...@samba.org
Date: Wed Feb 1 14:25:12 2012 +
s3:smbd:smb2: fix an assignment-instead-of-check bug conn_snum_used()
Accidential = instead of ==.
Autobuild-User: Michael Adam ob...@samba.org
Autobuild-Date: Wed Feb 1 17:10:15 CET 2012 on sn-devel-104
---
Summary of changes:
source3/smbd/conn.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/conn.c b/source3/smbd/conn.c
index f9ccfd9..e17d374 100644
--- a/source3/smbd/conn.c
+++ b/source3/smbd/conn.c
@@ -66,7 +66,7 @@ bool conn_snum_used(struct smbd_server_connection *sconn,
for (ptcon = sess-tcons.list; ptcon; ptcon =
ptcon-next) {
if (ptcon-compat_conn
ptcon-compat_conn-params
-
(ptcon-compat_conn-params-service = snum)) {
+
(ptcon-compat_conn-params-service == snum)) {
return true;
}
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 8c66c8c s3: Test for bug 8733
via 207af5d s3-vfstest: Correctly initialize the connection path
via 1bd7497 s3-vfstest: Fix some uninitialized vars
via 3c6bd8c s3-vfstest: Fix some pointless statics
via 1168700 s3-vfstest: Fix a typo
via 435f817 s3-vfstest: Fix some nonblank line endings
from 6ba09e0 s3:smbd:smb2: fix an assignment-instead-of-check bug
conn_snum_used()
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 8c66c8c756bde8654a3c1d07082b0ca5d357dc29
Author: Volker Lendecke v...@samba.org
Date: Wed Feb 1 20:07:24 2012 +0100
s3: Test for bug 8733
Autobuild-User: Volker Lendecke vlen...@samba.org
Autobuild-Date: Wed Feb 1 21:53:50 CET 2012 on sn-devel-104
commit 207af5d9e397eabbddbb2d273f542f641123aeb4
Author: Volker Lendecke v...@samba.org
Date: Wed Feb 1 19:44:32 2012 +0100
s3-vfstest: Correctly initialize the connection path
commit 1bd7497a18f3b42a5068e6a259a7f03c880f0020
Author: Volker Lendecke v...@samba.org
Date: Wed Feb 1 19:43:46 2012 +0100
s3-vfstest: Fix some uninitialized vars
commit 3c6bd8c1ef0cee7d63ce870f320ad5fc83b1dc7b
Author: Volker Lendecke v...@samba.org
Date: Wed Feb 1 19:42:55 2012 +0100
s3-vfstest: Fix some pointless statics
commit 1168700d91c4443a580e8b7c84f6ce3fd3181dab
Author: Volker Lendecke v...@samba.org
Date: Wed Feb 1 19:34:22 2012 +0100
s3-vfstest: Fix a typo
commit 435f8173299045e344d538ab7de03748560b420c
Author: Volker Lendecke v...@samba.org
Date: Wed Feb 1 14:42:39 2012 +0100
s3-vfstest: Fix some nonblank line endings
---
Summary of changes:
source3/tests/stream-depot/run.sh |9 ++
source3/tests/stream-depot/smb.conf|5 +++
source3/tests/stream-depot/vfstest.cmd |5 +++
source3/torture/cmd_vfs.c | 20 +++---
source3/torture/vfstest.c | 43 ---
5 files changed, 51 insertions(+), 31 deletions(-)
create mode 100755 source3/tests/stream-depot/run.sh
create mode 100644 source3/tests/stream-depot/smb.conf
create mode 100644 source3/tests/stream-depot/vfstest.cmd
Changeset truncated at 500 lines:
diff --git a/source3/tests/stream-depot/run.sh
b/source3/tests/stream-depot/run.sh
new file mode 100755
index 000..f459aa3
--- /dev/null
+++ b/source3/tests/stream-depot/run.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+rm -r .streams
+../../bin/vfstest -s smb.conf -f vfstest.cmd
+NUM=`find .streams | wc -l`
+if [ $NUM -ne 3 ] ; then
+echo streams_depot left ${NUM} in .streams, expected 3
+exit 1
+fi
+exit 0
diff --git a/source3/tests/stream-depot/smb.conf
b/source3/tests/stream-depot/smb.conf
new file mode 100644
index 000..426d23c
--- /dev/null
+++ b/source3/tests/stream-depot/smb.conf
@@ -0,0 +1,5 @@
+[tmp]
+# path is ignored by vfstest, it's always set to $(pwd)
+path = /tmp
+writable = yes
+vfs objects = streams_depot xattr_tdb
diff --git a/source3/tests/stream-depot/vfstest.cmd
b/source3/tests/stream-depot/vfstest.cmd
new file mode 100644
index 000..1400546
--- /dev/null
+++ b/source3/tests/stream-depot/vfstest.cmd
@@ -0,0 +1,5 @@
+connect
+mkdir x
+open x:y RC 0770
+unlink x:y
+rmdir x
diff --git a/source3/torture/cmd_vfs.c b/source3/torture/cmd_vfs.c
index 9527a34..7c44a48 100644
--- a/source3/torture/cmd_vfs.c
+++ b/source3/torture/cmd_vfs.c
@@ -1,4 +1,4 @@
-/*
+/*
Unix SMB/CIFS implementation.
VFS module functions
@@ -9,12 +9,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 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, see http://www.gnu.org/licenses/.
*/
@@ -31,7 +31,7 @@ static const char *null_string = ;
static NTSTATUS cmd_load_module(struct vfs_state *vfs, TALLOC_CTX *mem_ctx,
int argc, const char **argv)
{
int i;
-
+
if (argc 2) {
printf(Usage: load modules\n);
return NT_STATUS_OK;
@@ -207,7 +207,7 @@ static NTSTATUS cmd_mkdir(struct vfs_state *vfs, TALLOC_CTX
*mem_ctx, int argc,
printf(mkdir error=%d (%s)\n, errno, strerror(errno));
return NT_STATUS_UNSUCCESSFUL;
}
-
+
printf(mkdir: ok\n);
return NT_STATUS_OK;
}
@@ -216,7 +216,7 @@ static NTSTATUS cmd_mkdir(struct vfs_state *vfs, TALLOC_CTX
*mem_ctx, int argc,
static NTSTATUS cmd_closedir(struct vfs_state
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 3101d9b s3-libsmb: Remove dead gssapi code.
via 8080dba s3-lib: Fix util_cmdline which doesn't use popt.
from 8c66c8c s3: Test for bug 8733
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 3101d9bc2d741f57f04d48d5613d8f1c9697ef8e
Author: Andreas Schneider a...@samba.org
Date: Wed Feb 1 21:50:31 2012 +0100
s3-libsmb: Remove dead gssapi code.
Autobuild-User: Andreas Schneider a...@cryptomilk.org
Autobuild-Date: Wed Feb 1 23:29:44 CET 2012 on sn-devel-104
commit 8080dbad78edbc26c8ece8ae7f1abc27f0d7afd4
Author: Andreas Schneider a...@samba.org
Date: Mon Jan 30 10:53:18 2012 +0100
s3-lib: Fix util_cmdline which doesn't use popt.
This creates its own header file for util_cmdline so it doesn't need to
link against popt.
This should fix linking on FreeBSD.
---
Summary of changes:
source3/include/auth_info.h | 67
source3/include/popt_common.h | 14 +-
source3/include/proto.h | 33
source3/lib/netapi/cm.c |2 +-
source3/lib/util_cmdline.c|2 +-
source3/libsmb/cliconnect.c |2 +-
source3/libsmb/errormap.c | 112 -
source3/libsmb/libsmb_dir.c |2 +-
source3/libsmb/proto.h|1 +
source3/wscript_build |8 ++--
10 files changed, 77 insertions(+), 166 deletions(-)
create mode 100644 source3/include/auth_info.h
Changeset truncated at 500 lines:
diff --git a/source3/include/auth_info.h b/source3/include/auth_info.h
new file mode 100644
index 000..6b5105d
--- /dev/null
+++ b/source3/include/auth_info.h
@@ -0,0 +1,67 @@
+/*
+ * Unix SMB/CIFS implementation.
+ *
+ * Copyright (c) 2012 Andreas Schneider a...@samba.org
+ *
+ * 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 3 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, see http://www.gnu.org/licenses/.
+ */
+
+#ifndef _AUTH_INFO_H
+#define _AUTH_INFO_H
+
+struct user_auth_info {
+ char *username;
+ char *domain;
+ char *password;
+ bool got_pass;
+ bool use_kerberos;
+ int signing_state;
+ bool smb_encrypt;
+ bool use_machine_account;
+ bool fallback_after_kerberos;
+ bool use_ccache;
+};
+
+struct user_auth_info *user_auth_info_init(TALLOC_CTX *mem_ctx);
+const char *get_cmdline_auth_info_username(const struct user_auth_info
*auth_info);
+void set_cmdline_auth_info_username(struct user_auth_info *auth_info,
+ const char *username);
+const char *get_cmdline_auth_info_domain(const struct user_auth_info
*auth_info);
+void set_cmdline_auth_info_domain(struct user_auth_info *auth_info,
+ const char *domain);
+void set_cmdline_auth_info_password(struct user_auth_info *auth_info,
+ const char *password);
+const char *get_cmdline_auth_info_password(const struct user_auth_info
*auth_info);
+bool set_cmdline_auth_info_signing_state(struct user_auth_info *auth_info,
+const char *arg);
+int get_cmdline_auth_info_signing_state(const struct user_auth_info
*auth_info);
+void set_cmdline_auth_info_use_ccache(struct user_auth_info *auth_info,
+ bool b);
+bool get_cmdline_auth_info_use_ccache(const struct user_auth_info *auth_info);
+void set_cmdline_auth_info_use_kerberos(struct user_auth_info *auth_info,
+ bool b);
+bool get_cmdline_auth_info_use_kerberos(const struct user_auth_info
*auth_info);
+void set_cmdline_auth_info_fallback_after_kerberos(struct user_auth_info
*auth_info,
+ bool b);
+bool get_cmdline_auth_info_fallback_after_kerberos(const struct user_auth_info
*auth_info);
+void set_cmdline_auth_info_use_krb5_ticket(struct user_auth_info *auth_info);
+void set_cmdline_auth_info_smb_encrypt(struct user_auth_info *auth_info);
+void set_cmdline_auth_info_use_machine_account(struct user_auth_info
*auth_info);
+bool get_cmdline_auth_info_got_pass(const struct user_auth_info *auth_info);
+bool get_cmdline_auth_info_smb_encrypt(const struct user_auth_info *auth_info);
+bool get_cmdline_auth_info_use_machine_account(const struct
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via c892217 smbtorture: Do not leak child processes when exiting
from 3101d9b s3-libsmb: Remove dead gssapi code.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit c892217a1236a5fde9072d726605e2e1b610a160
Author: Christof Schmitt christof.schm...@us.ibm.com
Date: Thu Dec 15 13:53:48 2011 -0700
smbtorture: Do not leak child processes when exiting
When some child processes could not be created, smbtorture would exit
and leave the successfully started child processes running. Add a loop
to kill the existing child processes for this case.
Signed-off-by: Jeremy Allison j...@samba.org
Autobuild-User: Jeremy Allison j...@samba.org
Autobuild-Date: Thu Feb 2 01:35:27 CET 2012 on sn-devel-104
---
Summary of changes:
source4/torture/util_smb.c |8
1 files changed, 8 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/torture/util_smb.c b/source4/torture/util_smb.c
index c9a4a0e..9efa334 100644
--- a/source4/torture/util_smb.c
+++ b/source4/torture/util_smb.c
@@ -729,6 +729,14 @@ double torture_create_procs(struct torture_context *tctx,
if (synccount != torture_nprocs) {
printf(FAILED TO START %d CLIENTS (started %d)\n,
torture_nprocs, synccount);
+
+ /* cleanup child processes */
+ for (i = 0; i torture_nprocs; i++) {
+ if (child_status[i]) {
+ kill(child_status[i], SIGTERM);
+ }
+ }
+
*result = false;
return timeval_elapsed(tv);
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via b3fb115 tdb2: add --disable-tdb2
from c892217 smbtorture: Do not leak child processes when exiting
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit b3fb115a3932423267022152a04fa5cfcd059239
Author: Rusty Russell ru...@rustcorp.com.au
Date: Thu Feb 2 11:36:49 2012 +1030
tdb2: add --disable-tdb2
I thought you could --disable-tdb2=false, apparently not! Thanks
Michael Adam...
Signed-off-by: Rusty Russell ru...@rustcorp.com.au
Autobuild-User: Rusty Russell ru...@rustcorp.com.au
Autobuild-Date: Thu Feb 2 03:43:08 CET 2012 on sn-devel-104
---
Summary of changes:
lib/tdb2/wscript |3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/tdb2/wscript b/lib/tdb2/wscript
index 1211523..e4fb62b 100644
--- a/lib/tdb2/wscript
+++ b/lib/tdb2/wscript
@@ -24,6 +24,9 @@ def set_options(opt):
opt.add_option('--enable-tdb2',
help=(Use tdb2 API instead of tdb1 [True]),
action=store_true, dest='BUILD_TDB2', default=True)
+opt.add_option('--disable-tdb2',
+ help=(Use old tdb1 API instead of tdb2),
+ action=store_false, dest='BUILD_TDB2')
if opt.IN_LAUNCH_DIR():
opt.add_option('--disable-python',
help=(disable the pytdb module),
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via e3dac4b replace: Only add bsd dependency when bsd library was found.
from b3fb115 tdb2: add --disable-tdb2
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit e3dac4b61aadeced427001f823377c79e457b8dd
Author: Jelmer Vernooij jel...@samba.org
Date: Thu Feb 2 02:48:35 2012 +0100
replace: Only add bsd dependency when bsd library was found.
Autobuild-User: Jelmer Vernooij jel...@samba.org
Autobuild-Date: Thu Feb 2 05:18:45 CET 2012 on sn-devel-104
---
Summary of changes:
lib/replace/wscript |5 -
1 files changed, 4 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/replace/wscript b/lib/replace/wscript
index 4b4f0a8..5bafc1f 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -452,6 +452,9 @@ def build(bld):
if not bld.CONFIG_SET('HAVE_INET_NTOP'): REPLACE_SOURCE += '
inet_ntop.c'
if not bld.CONFIG_SET('HAVE_INET_PTON'): REPLACE_SOURCE += '
inet_pton.c'
+extra_libs = ''
+if bld.CONFIG_SET('HAVE_LIBBSD'): extra_libs += ' bsd'
+
bld.SAMBA_LIBRARY('replace',
source=REPLACE_SOURCE,
group='base_libraries',
@@ -461,7 +464,7 @@ def build(bld):
# at the moment:
# hide_symbols=bld.BUILTIN_LIBRARY('replace'),
private_library=True,
- deps='crypt dl nsl socket rt bsd')
+ deps='crypt dl nsl socket rt' + extra_libs)
bld.SAMBA_SUBSYSTEM('replace-test',
source='''test/testsuite.c test/strptime.c
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 0fdd6c7 build: fixed a link order problem from e3dac4b replace: Only add bsd dependency when bsd library was found. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 0fdd6c7632a070fc3f6251f44c520fa324155a7d Author: Andrew Tridgell tri...@samba.org Date: Thu Feb 2 12:36:44 2012 +1100 build: fixed a link order problem this fixes a problem found by obnox where the -L path for CUPS was put before the path to internal libraries. The install path for CUPS happened to be the same as for a old system libtevent, which meant we linked against the old tevent instead of the correct one from our private library paths. The problem was that we were adding the -L paths directly to the ldflags. The waf core code (in ccroot.py) only adds more paths if they are not there already. So by adding it in ldflags it was not added at the end of the list. The fix is just to not do the -L processing in wafsamba and let the waf core do it in the right order Autobuild-User: Andrew Tridgell tri...@samba.org Autobuild-Date: Thu Feb 2 06:54:42 CET 2012 on sn-devel-104 --- Summary of changes: buildtools/wafsamba/samba_autoconf.py |4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py index 1ea818e..6ed719a 100644 --- a/buildtools/wafsamba/samba_autoconf.py +++ b/buildtools/wafsamba/samba_autoconf.py @@ -471,7 +471,9 @@ def library_flags(self, libs): inc_path = getattr(self.env, 'CPPPATH_%s' % lib.upper(), []) lib_path = getattr(self.env, 'LIBPATH_%s' % lib.upper(), []) ccflags.extend(['-I%s' % i for i in inc_path]) -ldflags.extend(['-L%s' % l for l in lib_path]) +# note that we do not add the -L in here, as that is added by the waf +# core. Adding it here would just change the order that it is put on the link line +# which can cause system paths to be added before internal libraries extra_ccflags = TO_LIST(getattr(self.env, 'CCFLAGS_%s' % lib.upper(), [])) extra_ldflags = TO_LIST(getattr(self.env, 'LDFLAGS_%s' % lib.upper(), [])) ccflags.extend(extra_ccflags) -- Samba Shared Repository
