Re: [Samba] Compile help for Solaris 10 x86, samba 3.0.28a deficient?
Hi all, see http://www.blastwave.org/testing/ you will find 3.0.32 and 3.2.2 there If you want to work on this together, sounds great, come over to Blastwave and we can sort this out. I can tell you that building Samba on Solaris is a miserable experience, a lonely miserable wretched task. but .. you already know that :-\ I do too. One has to wonder how code that is written in C can be moving towards such poor portability that it compiles in the linux world but not the unix world. I'd be happy to discuss that .. and whatever else is needed for a nice stable package .. but not here. please see http://wiki.blastwave.org and click join us such that we can suffer through this process together. Dennis Clarke ps: I am working on the samba packages here .. hence the misery -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Compile help for Solaris 10 x86, samba 3.0.28a deficient?
On Sunday 12 October 2008 07:55:01 Jake Carroll wrote: I sort of hoped that somebody would release pre-built binaries for Sol 10 x86, unfortunately, all I can find on samba.org is a long way out of date SPARC binary of 3.0.23. There are Blastwave x86 packages out there. If you have searched the old posts on this list, you should have found that maintainer (Dennis Clarke) even posted links here on the list. Here you go: Samba 3.0.31: http://www.blastwave.org/testing/samba-3.0.31,REV=2008.08.22-SunOS5.8-i386-CSW.pkg.bz2 Samba 3.2.2: http://www.blastwave.org/testing/samba-3.2.2,REV=2008.08.22-SunOS5.8-i386-CSW.pkg.gz I don't know if the links are still functional. They function .. always have .. always will .. until we release them to all the mirrors. The poor man should work with me .. sounds like we have both worked in lonely miserable long nights and days and wondered why we were being punished, what sins had we committed that we deserved this. yes .. it is that bad. Dennis -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Compile help for Solaris 10 x86, samba 3.0.28a deficient?
On Sun, Oct 12, 2008 at 07:50:33AM -0400, Dennis Clarke wrote: see http://www.blastwave.org/testing/ you will find 3.0.32 and 3.2.2 there If you want to work on this together, sounds great, come over to Blastwave and we can sort this out. I can tell you that building Samba on Solaris is a miserable experience, a lonely miserable wretched task. Wait a second -- at least we try to keep our build farm hosts happy. At this very moment, the build is broken, but I've already checked in a fix. If you have necessary patches, please send them to samba-technical. The packaging/Solaris subdirectory is pretty much orphaned, it could really benefit from some care. Volker pgph8mwdfvujl.pgp Description: PGP signature -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Compile help for Solaris 10 x86, samba 3.0.28a deficient?
On Sun, Oct 12, 2008 at 07:50:33AM -0400, Dennis Clarke wrote: see http://www.blastwave.org/testing/ you will find 3.0.32 and 3.2.2 there If you want to work on this together, sounds great, come over to Blastwave and we can sort this out. I can tell you that building Samba on Solaris is a miserable experience, a lonely miserable wretched task. Wait a second -- at least we try to keep our build farm hosts happy. At this very moment, the build is broken, but I've already checked in a fix. If you have necessary patches, please send them to samba-technical. The packaging/Solaris subdirectory is pretty much orphaned, it could really benefit from some care. I'd be happy to fill it with a samba package or a set. Keep in mind that any such package will require dependencies and I may come up with something standalone that just works with only one package being installed. I have some thoughts on that ... but anyways .. I'd be happy to help with that poor forgotten orphan. Dennis -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Compile help for Solaris 10 x86, samba 3.0.28a deficient?
On Sun, Oct 12, 2008 at 12:26:36PM -0400, Dennis Clarke wrote: I'd be happy to fill it with a samba package or a set. Keep in mind that any such package will require dependencies and I may come up with something standalone that just works with only one package being installed. I have some thoughts on that ... but anyways .. I'd be happy to help with that poor forgotten orphan. You're very welcome. You might want to look at http://wiki.samba.org/index.php/Using_Git_for_Samba_Development If you send in patches in git format, you get the credits in git log and git blame :-) Volker pgpxdzv3y52rJ.pgp Description: PGP signature -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Compile help for Solaris 10 x86, samba 3.0.28a deficient?
On Sun, Oct 12, 2008 at 12:26:36PM -0400, Dennis Clarke wrote: I'd be happy to fill it with a samba package or a set. Keep in mind that any such package will require dependencies and I may come up with something standalone that just works with only one package being installed. I have some thoughts on that ... but anyways .. I'd be happy to help with that poor forgotten orphan. You're very welcome. You might want to look at http://wiki.samba.org/index.php/Using_Git_for_Samba_Development If you send in patches in git format, you get the credits in git log and git blame :-) Looks like a good idea .. guess what my first job is? You guessed it ! I have to port git to Solaris ! What fun :-) -- Dennis Clarke -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Compile help for Solaris 10 x86, samba 3.0.28a deficient?
On Sun, Oct 12, 2008 at 03:58:00PM -0400, Dennis Clarke wrote: If you send in patches in git format, you get the credits in git log and git blame :-) Looks like a good idea .. guess what my first job is? You guessed it ! I have to port git to Solaris ! What fun :-) Well, you can always send patches raw. But then you don't get the blamecredits :-) Volker pgpUiwSKVt68F.pgp Description: PGP signature -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Compile help for Solaris 10 x86, samba 3.0.28a deficient?
On Sun, Oct 12, 2008 at 03:58:00PM -0400, Dennis Clarke wrote: If you send in patches in git format, you get the credits in git log and git blame :-) Looks like a good idea .. guess what my first job is? You guessed it ! I have to port git to Solaris ! What fun :-) Well, you can always send patches raw. But then you don't get the blamecredits :-) nah .. where is the fun in that ? Solaris people will want a functional git anyways .. so I may as well get that into the catalog here. My real issue with samba is the nasty errors I get during linkage. With GCC 4.3.2 I see this : . . . mkdir bin mkdir lib/talloc Compiling lib/talloc/talloc.c Linking non-shared library bin/libtalloc.a mkdir lib/replace Compiling lib/replace/replace.c Compiling lib/replace/snprintf.c Compiling lib/replace/getpass.c Compiling lib/replace/strptime.c Compiling lib/replace/timegm.c Compiling lib/replace/inet_aton.c Compiling lib/replace/getifaddrs.c creating /export/nfs/build/samba-3.2.3-build/../samba-3.2.3/source/exports/libtalloc.syms Linking shared library bin/libtalloc.so.1 ld: warning: option -o appears more than once, first setting taken Text relocation remains referenced against symbol offset in file _init 0x34 /export/home/dclarke/local/lib/gcc/sparc-sun-solaris2.8/4.2.4/crt1.o main0x5c /export/home/dclarke/local/lib/gcc/sparc-sun-solaris2.8/4.2.4/crt1.o _fini 0x24 /export/home/dclarke/local/lib/gcc/sparc-sun-solaris2.8/4.2.4/crt1.o _fini 0x28 /export/home/dclarke/local/lib/gcc/sparc-sun-solaris2.8/4.2.4/crt1.o exit0x64 /export/home/dclarke/local/lib/gcc/sparc-sun-solaris2.8/4.2.4/crt1.o _environ0x50 /export/home/dclarke/local/lib/gcc/sparc-sun-solaris2.8/4.2.4/crt1.o _environ0x54 /export/home/dclarke/local/lib/gcc/sparc-sun-solaris2.8/4.2.4/crt1.o atexit 0x1c /export/home/dclarke/local/lib/gcc/sparc-sun-solaris2.8/4.2.4/crt1.o atexit 0x2c /export/home/dclarke/local/lib/gcc/sparc-sun-solaris2.8/4.2.4/crt1.o _exit 0x6c /export/home/dclarke/local/lib/gcc/sparc-sun-solaris2.8/4.2.4/crt1.o ld: fatal: relocations remain against allocatable but non-writable sections collect2: ld returned 1 exit status make: *** [bin/libtalloc.so.1] Error 1 sometimes the process feels very voodoo spooky because I am quite careful with compiler options. With Sun Studio 11 I get the same sort of error message but with less detail. quite annoying. Dennis -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Don't change password in PDC
Someone know that you can block an account of one (PDC) samba domain so users do not change the password? Thanks -- Celso Vianna BSD User: 51318 http://www.bsdcounter.org 63 8404-8559 Palmas/TO -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Multiple Samba accounts with the rights of a single Unix account?
Is it possible to have a standalone Samba server map different username/password pairs to a single Unix account? More specifically, I'll be using an external passdb (pdb-mysql or LDAP), and each username will only see a home directory with the same name. But I don't want to have to create a separate Unix account / UID for each username/password, the restriction by directory is enough. Instead, a single Unix account will be given rights to access all home directories, and I want Samba to use it for all username/password pairs. Is such a setup possible? The 'username map' option is not suitable, because the username is translated prior to authentication, so all usernames would share the same password. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Compile help for Solaris 10 x86, samba 3.0.28a deficient?
Folks, Just wanted to say thank you for kick starting this. Really glad the community is willing to help out on this and make things happen! Let me know how I can help here. Ultimately, all I want is a binary that will work with Sun krb5, aio, ldap, ads et al that uses the Sun native binaries - exactly in the same way that /usr/sfw/sbin/smbd would! Maybe asking too much? ;) Let the games begin, I suppose! JC PS: Dennis, I see something similar to this: /export/home/dclarke/local/lib/gcc/sparc-sun-solaris2.8/4.2.4/crt1.o main0x5c /export/home/dclarke/local/lib/gcc/sparc-sun-solaris2.8/4.2.4/crt1.o ...and yes, it scares me too! On Oct 13, 2008, at 6:44 AM, Dennis Clarke wrote: On Sun, Oct 12, 2008 at 03:58:00PM -0400, Dennis Clarke wrote: If you send in patches in git format, you get the credits in git log and git blame :-) Looks like a good idea .. guess what my first job is? You guessed it ! I have to port git to Solaris ! What fun :-) Well, you can always send patches raw. But then you don't get the blamecredits :-) nah .. where is the fun in that ? Solaris people will want a functional git anyways .. so I may as well get that into the catalog here. My real issue with samba is the nasty errors I get during linkage. With GCC 4.3.2 I see this : . . . mkdir bin mkdir lib/talloc Compiling lib/talloc/talloc.c Linking non-shared library bin/libtalloc.a mkdir lib/replace Compiling lib/replace/replace.c Compiling lib/replace/snprintf.c Compiling lib/replace/getpass.c Compiling lib/replace/strptime.c Compiling lib/replace/timegm.c Compiling lib/replace/inet_aton.c Compiling lib/replace/getifaddrs.c creating /export/nfs/build/samba-3.2.3-build/../samba-3.2.3/source/exports/ libtalloc.syms Linking shared library bin/libtalloc.so.1 ld: warning: option -o appears more than once, first setting taken Text relocation remains referenced against symbol offset in file _init 0x34 /export/home/dclarke/local/lib/gcc/sparc-sun-solaris2.8/4.2.4/crt1.o main0x5c /export/home/dclarke/local/lib/gcc/sparc-sun-solaris2.8/4.2.4/crt1.o _fini 0x24 /export/home/dclarke/local/lib/gcc/sparc-sun-solaris2.8/4.2.4/crt1.o _fini 0x28 /export/home/dclarke/local/lib/gcc/sparc-sun-solaris2.8/4.2.4/crt1.o exit0x64 /export/home/dclarke/local/lib/gcc/sparc-sun-solaris2.8/4.2.4/crt1.o _environ0x50 /export/home/dclarke/local/lib/gcc/sparc-sun-solaris2.8/4.2.4/crt1.o _environ0x54 /export/home/dclarke/local/lib/gcc/sparc-sun-solaris2.8/4.2.4/crt1.o atexit 0x1c /export/home/dclarke/local/lib/gcc/sparc-sun-solaris2.8/4.2.4/crt1.o atexit 0x2c /export/home/dclarke/local/lib/gcc/sparc-sun-solaris2.8/4.2.4/crt1.o _exit 0x6c /export/home/dclarke/local/lib/gcc/sparc-sun-solaris2.8/4.2.4/crt1.o ld: fatal: relocations remain against allocatable but non-writable sections collect2: ld returned 1 exit status make: *** [bin/libtalloc.so.1] Error 1 sometimes the process feels very voodoo spooky because I am quite careful with compiler options. With Sun Studio 11 I get the same sort of error message but with less detail. quite annoying. Dennis -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Multiple Samba accounts with the rights of a single Unix account?
Quoting Peter Petrov [EMAIL PROTECTED]: Is it possible to have a standalone Samba server map different username/password pairs to a single Unix account? force user/group? This message was sent using IMP, the Internet Messaging Program. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[SCM] Samba Shared Repository - branch master updated - d661ac196e728584d796e17b389724046586c99a
The branch, master has been updated
via d661ac196e728584d796e17b389724046586c99a (commit)
from a19929dac185cebd4ec70e8aa3703a8bb884385f (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit d661ac196e728584d796e17b389724046586c99a
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Sun Oct 12 10:38:55 2008 +0200
Fix the build
---
Summary of changes:
source3/printing/pcap.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/printing/pcap.c b/source3/printing/pcap.c
index 10c1a2d..b9e5ad5 100644
--- a/source3/printing/pcap.c
+++ b/source3/printing/pcap.c
@@ -282,5 +282,5 @@ void pcap_printer_fn_specific(const struct pcap_cache *pc,
void pcap_printer_fn(void (*fn)(const char *, const char *, void *), void
*pdata)
{
- return pcap_printer_fn_specific(pcap_cache, fn, pdata);
+ pcap_printer_fn_specific(pcap_cache, fn, pdata);
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4253-ge160a19
The branch, v3-3-test has been updated
via e160a19ffc0727c46a696335c9d140e236923cdb (commit)
from d0f7261031f76965879036bd5c7d0a19eabf47cc (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit e160a19ffc0727c46a696335c9d140e236923cdb
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Sun Oct 12 10:39:53 2008 +0200
Fix the build
---
Summary of changes:
source/printing/pcap.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/printing/pcap.c b/source/printing/pcap.c
index 10c1a2d..b9e5ad5 100644
--- a/source/printing/pcap.c
+++ b/source/printing/pcap.c
@@ -282,5 +282,5 @@ void pcap_printer_fn_specific(const struct pcap_cache *pc,
void pcap_printer_fn(void (*fn)(const char *, const char *, void *), void
*pdata)
{
- return pcap_printer_fn_specific(pcap_cache, fn, pdata);
+ pcap_printer_fn_specific(pcap_cache, fn, pdata);
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3085-g1ab2a5b
The branch, v3-2-test has been updated
via 1ab2a5b958a900a078cadf98b83fba7fadbaedf9 (commit)
from 48ee5a66d18b805d03f93c85e98a41374d82cfb9 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 1ab2a5b958a900a078cadf98b83fba7fadbaedf9
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Sun Oct 12 10:41:29 2008 +0200
Fix the build
---
Summary of changes:
source/printing/pcap.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/printing/pcap.c b/source/printing/pcap.c
index 10c1a2d..b9e5ad5 100644
--- a/source/printing/pcap.c
+++ b/source/printing/pcap.c
@@ -282,5 +282,5 @@ void pcap_printer_fn_specific(const struct pcap_cache *pc,
void pcap_printer_fn(void (*fn)(const char *, const char *, void *), void
*pdata)
{
- return pcap_printer_fn_specific(pcap_cache, fn, pdata);
+ pcap_printer_fn_specific(pcap_cache, fn, pdata);
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - dc2e98edc40ff30bd172eecf9e08219b7678df44
The branch, master has been updated via dc2e98edc40ff30bd172eecf9e08219b7678df44 (commit) from 756b4b6048f718b5c34af105dd670059f7b83882 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit dc2e98edc40ff30bd172eecf9e08219b7678df44 Author: Volker Lendecke [EMAIL PROTECTED] Date: Sun Oct 12 14:03:09 2008 +0200 Fix make etags -- args list was too long for my etags --- Summary of changes: source3/Makefile.in |4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/Makefile.in b/source3/Makefile.in index d1eb3d5..e58d3ba 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -2690,7 +2690,9 @@ include/build_env.h: script/build_env.sh proto:: etags:: - etags `find $(srcdir)/.. -name *.[ch]` + etags `find $(srcdir) -name *.[ch]` + etags --append `find $(srcdir)/../lib -name *.[ch]` + etags --append `find $(srcdir)/../source4 -name *.[ch]` ctags:: ctags `find $(srcdir)/.. -name *.[ch]` -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4255-g4714784
The branch, v3-3-test has been updated
via 4714784877081b6ca0a942554af8595889f044fe (commit)
via 62f092d010313e8f3eb4e35ffb0b76de9539d8c9 (commit)
from e160a19ffc0727c46a696335c9d140e236923cdb (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit 4714784877081b6ca0a942554af8595889f044fe
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Sun Oct 12 11:44:09 2008 +0200
Make get_rpc_pipe() static
commit 62f092d010313e8f3eb4e35ffb0b76de9539d8c9
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Sun Oct 12 11:43:52 2008 +0200
Remove unused #defines
---
Summary of changes:
source/include/proto.h |1 -
source/rpc_server/srv_pipe_hnd.c |7 +++
2 files changed, 3 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/include/proto.h b/source/include/proto.h
index d69de44..2cf93cc 100644
--- a/source/include/proto.h
+++ b/source/include/proto.h
@@ -8824,7 +8824,6 @@ bool set_rpc_pipe_hnd_state(smb_np_struct *p, uint16
device_state);
bool close_rpc_pipe_hnd(smb_np_struct *p);
void pipe_close_conn(connection_struct *conn);
smb_np_struct *get_rpc_pipe_p(uint16 pnum);
-smb_np_struct *get_rpc_pipe(int pnum);
struct pipes_struct *make_internal_rpc_pipe_p(const char *pipe_name,
const char *client_address,
struct auth_serversupplied_info
*server_info,
diff --git a/source/rpc_server/srv_pipe_hnd.c b/source/rpc_server/srv_pipe_hnd.c
index 3968d41..e52434f 100644
--- a/source/rpc_server/srv_pipe_hnd.c
+++ b/source/rpc_server/srv_pipe_hnd.c
@@ -24,9 +24,6 @@
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_RPC_SRV
-#definePIPE\\PIPE\\
-#definePIPELEN strlen(PIPE)
-
static smb_np_struct *chain_p;
static int pipes_open;
@@ -1210,6 +1207,8 @@ static int close_internal_rpc_pipe_hnd(struct
pipes_struct *p)
return True;
}
+static smb_np_struct *get_rpc_pipe(int pnum);
+
/
Find an rpc pipe given a pipe handle in a buffer and an offset.
/
@@ -1227,7 +1226,7 @@ smb_np_struct *get_rpc_pipe_p(uint16 pnum)
Find an rpc pipe given a pipe handle.
/
-smb_np_struct *get_rpc_pipe(int pnum)
+static smb_np_struct *get_rpc_pipe(int pnum)
{
smb_np_struct *p;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - 3bcb76a92499aca8b209c8a5f07829cd852cbaa0
The branch, master has been updated
via 3bcb76a92499aca8b209c8a5f07829cd852cbaa0 (commit)
from dc2e98edc40ff30bd172eecf9e08219b7678df44 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 3bcb76a92499aca8b209c8a5f07829cd852cbaa0
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Sun Oct 12 14:07:34 2008 +0200
Fix warning: initialization discards qualifiers from pointer target type
---
Summary of changes:
source3/libsmb/smbdes.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libsmb/smbdes.c b/source3/libsmb/smbdes.c
index 76779e2..8087d66 100644
--- a/source3/libsmb/smbdes.c
+++ b/source3/libsmb/smbdes.c
@@ -389,7 +389,7 @@ void des_crypt112_16(unsigned char out[16], unsigned char
in[16], const unsigned
void SamOEMhash( unsigned char *data, const unsigned char key[16], size_t len)
{
struct arcfour_state arc4_state;
- DATA_BLOB keyblob = { key, 16 };
+ const DATA_BLOB keyblob = data_blob_const(key, 16);
arcfour_init(arc4_state, keyblob);
arcfour_crypt_sbox(arc4_state, data, len);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4256-g59e44da
The branch, v3-3-test has been updated
via 59e44daf057d687262adcd1f61f0b973a1c1be58 (commit)
from 4714784877081b6ca0a942554af8595889f044fe (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit 59e44daf057d687262adcd1f61f0b973a1c1be58
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Sun Oct 12 12:17:00 2008 +0200
Revert Make get_rpc_pipe() static
This reverts commit 4714784877081b6ca0a942554af8595889f044fe.
---
Summary of changes:
source/include/proto.h |1 +
source/rpc_server/srv_pipe_hnd.c |4 +---
2 files changed, 2 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/include/proto.h b/source/include/proto.h
index 2cf93cc..d69de44 100644
--- a/source/include/proto.h
+++ b/source/include/proto.h
@@ -8824,6 +8824,7 @@ bool set_rpc_pipe_hnd_state(smb_np_struct *p, uint16
device_state);
bool close_rpc_pipe_hnd(smb_np_struct *p);
void pipe_close_conn(connection_struct *conn);
smb_np_struct *get_rpc_pipe_p(uint16 pnum);
+smb_np_struct *get_rpc_pipe(int pnum);
struct pipes_struct *make_internal_rpc_pipe_p(const char *pipe_name,
const char *client_address,
struct auth_serversupplied_info
*server_info,
diff --git a/source/rpc_server/srv_pipe_hnd.c b/source/rpc_server/srv_pipe_hnd.c
index e52434f..c55e328 100644
--- a/source/rpc_server/srv_pipe_hnd.c
+++ b/source/rpc_server/srv_pipe_hnd.c
@@ -1207,8 +1207,6 @@ static int close_internal_rpc_pipe_hnd(struct
pipes_struct *p)
return True;
}
-static smb_np_struct *get_rpc_pipe(int pnum);
-
/
Find an rpc pipe given a pipe handle in a buffer and an offset.
/
@@ -1226,7 +1224,7 @@ smb_np_struct *get_rpc_pipe_p(uint16 pnum)
Find an rpc pipe given a pipe handle.
/
-static smb_np_struct *get_rpc_pipe(int pnum)
+smb_np_struct *get_rpc_pipe(int pnum)
{
smb_np_struct *p;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - 756b4b6048f718b5c34af105dd670059f7b83882
The branch, master has been updated
via 756b4b6048f718b5c34af105dd670059f7b83882 (commit)
from f25972832ec9d5a130da9dc060f4c3ed35bda7db (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 756b4b6048f718b5c34af105dd670059f7b83882
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Sun Oct 12 12:16:18 2008 +0200
Revert Make get_rpc_pipe() static
This reverts commit f25972832ec9d5a130da9dc060f4c3ed35bda7db.
---
Summary of changes:
source3/include/proto.h |1 +
source3/rpc_server/srv_pipe_hnd.c |4 +---
2 files changed, 2 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/proto.h b/source3/include/proto.h
index e4ea3d1..08c1e2c 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -8712,6 +8712,7 @@ bool set_rpc_pipe_hnd_state(smb_np_struct *p, uint16
device_state);
bool close_rpc_pipe_hnd(smb_np_struct *p);
void pipe_close_conn(connection_struct *conn);
smb_np_struct *get_rpc_pipe_p(uint16 pnum);
+smb_np_struct *get_rpc_pipe(int pnum);
struct pipes_struct *make_internal_rpc_pipe_p(const char *pipe_name,
const char *client_address,
struct auth_serversupplied_info
*server_info,
diff --git a/source3/rpc_server/srv_pipe_hnd.c
b/source3/rpc_server/srv_pipe_hnd.c
index e52434f..c55e328 100644
--- a/source3/rpc_server/srv_pipe_hnd.c
+++ b/source3/rpc_server/srv_pipe_hnd.c
@@ -1207,8 +1207,6 @@ static int close_internal_rpc_pipe_hnd(struct
pipes_struct *p)
return True;
}
-static smb_np_struct *get_rpc_pipe(int pnum);
-
/
Find an rpc pipe given a pipe handle in a buffer and an offset.
/
@@ -1226,7 +1224,7 @@ smb_np_struct *get_rpc_pipe_p(uint16 pnum)
Find an rpc pipe given a pipe handle.
/
-static smb_np_struct *get_rpc_pipe(int pnum)
+smb_np_struct *get_rpc_pipe(int pnum)
{
smb_np_struct *p;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - f25972832ec9d5a130da9dc060f4c3ed35bda7db
The branch, master has been updated
via f25972832ec9d5a130da9dc060f4c3ed35bda7db (commit)
via 6b98c1b1596504ae59b88f6e6da0c02fe30afa2d (commit)
from d661ac196e728584d796e17b389724046586c99a (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit f25972832ec9d5a130da9dc060f4c3ed35bda7db
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Sun Oct 12 11:44:09 2008 +0200
Make get_rpc_pipe() static
commit 6b98c1b1596504ae59b88f6e6da0c02fe30afa2d
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Sun Oct 12 11:43:52 2008 +0200
Remove unused #defines
---
Summary of changes:
source3/include/proto.h |1 -
source3/rpc_server/srv_pipe_hnd.c |7 +++
2 files changed, 3 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 08c1e2c..e4ea3d1 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -8712,7 +8712,6 @@ bool set_rpc_pipe_hnd_state(smb_np_struct *p, uint16
device_state);
bool close_rpc_pipe_hnd(smb_np_struct *p);
void pipe_close_conn(connection_struct *conn);
smb_np_struct *get_rpc_pipe_p(uint16 pnum);
-smb_np_struct *get_rpc_pipe(int pnum);
struct pipes_struct *make_internal_rpc_pipe_p(const char *pipe_name,
const char *client_address,
struct auth_serversupplied_info
*server_info,
diff --git a/source3/rpc_server/srv_pipe_hnd.c
b/source3/rpc_server/srv_pipe_hnd.c
index 3968d41..e52434f 100644
--- a/source3/rpc_server/srv_pipe_hnd.c
+++ b/source3/rpc_server/srv_pipe_hnd.c
@@ -24,9 +24,6 @@
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_RPC_SRV
-#definePIPE\\PIPE\\
-#definePIPELEN strlen(PIPE)
-
static smb_np_struct *chain_p;
static int pipes_open;
@@ -1210,6 +1207,8 @@ static int close_internal_rpc_pipe_hnd(struct
pipes_struct *p)
return True;
}
+static smb_np_struct *get_rpc_pipe(int pnum);
+
/
Find an rpc pipe given a pipe handle in a buffer and an offset.
/
@@ -1227,7 +1226,7 @@ smb_np_struct *get_rpc_pipe_p(uint16 pnum)
Find an rpc pipe given a pipe handle.
/
-smb_np_struct *get_rpc_pipe(int pnum)
+static smb_np_struct *get_rpc_pipe(int pnum)
{
smb_np_struct *p;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - 1d0cda2f034c44e2274f90b5453e5b031446c034
The branch, master has been updated via 1d0cda2f034c44e2274f90b5453e5b031446c034 (commit) via a59ce1d94c5b3e3e57c40ee0a60c1c3df3304bfa (commit) from 3bcb76a92499aca8b209c8a5f07829cd852cbaa0 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 1d0cda2f034c44e2274f90b5453e5b031446c034 Author: Jelmer Vernooij [EMAIL PROTECTED] Date: Sun Oct 12 16:19:15 2008 +0200 Use common xfile.h. commit a59ce1d94c5b3e3e57c40ee0a60c1c3df3304bfa Author: Jelmer Vernooij [EMAIL PROTECTED] Date: Sun Oct 12 16:17:21 2008 +0200 Use common byteorder.h. --- Summary of changes: source3/include/byteorder.h | 176 --- source3/include/includes.h |4 +- source3/include/xfile.h | 48 source3/libsmb/smbencrypt.c |2 +- 4 files changed, 3 insertions(+), 227 deletions(-) delete mode 100644 source3/include/byteorder.h delete mode 100644 source3/include/xfile.h Changeset truncated at 500 lines: diff --git a/source3/include/byteorder.h b/source3/include/byteorder.h deleted file mode 100644 index 9ced9ce..000 --- a/source3/include/byteorder.h +++ /dev/null @@ -1,176 +0,0 @@ -/* - Unix SMB/CIFS implementation. - SMB Byte handling - Copyright (C) Andrew Tridgell 1992-1998 - - 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 _BYTEORDER_H -#define _BYTEORDER_H - -/* - This file implements macros for machine independent short and - int manipulation - -Here is a description of this file that I emailed to the samba list once: - - I am confused about the way that byteorder.h works in Samba. I have - looked at it, and I would have thought that you might make a distinction - between LE and BE machines, but you only seem to distinguish between 386 - and all other architectures. - - Can you give me a clue? - -sure. - -The distinction between 386 and other architectures is only there as -an optimisation. You can take it out completely and it will make no -difference. The routines (macros) in byteorder.h are totally byteorder -independent. The 386 optimsation just takes advantage of the fact that -the x86 processors don't care about alignment, so we don't have to -align ints on int boundaries etc. If there are other processors out -there that aren't alignment sensitive then you could also define -CAREFUL_ALIGNMENT=0 on those processors as well. - -Ok, now to the macros themselves. I'll take a simple example, say we -want to extract a 2 byte integer from a SMB packet and put it into a -type called uint16 that is in the local machines byte order, and you -want to do it with only the assumption that uint16 is _at_least_ 16 -bits long (this last condition is very important for architectures -that don't have any int types that are 2 bytes long) - -You do this: - -#define CVAL(buf,pos) (((unsigned char *)(buf))[pos]) -#define PVAL(buf,pos) ((unsigned)CVAL(buf,pos)) -#define SVAL(buf,pos) (PVAL(buf,pos)|PVAL(buf,(pos)+1)8) - -then to extract a uint16 value at offset 25 in a buffer you do this: - -char *buffer = foo_bar(); -uint16 xx = SVAL(buffer,25); - -We are using the byteoder independence of the ANSI C bitshifts to do -the work. A good optimising compiler should turn this into efficient -code, especially if it happens to have the right byteorder :-) - -I know these macros can be made a bit tidier by removing some of the -casts, but you need to look at byteorder.h as a whole to see the -reasoning behind them. byteorder.h defines the following macros: - -SVAL(buf,pos) - extract a 2 byte SMB value -IVAL(buf,pos) - extract a 4 byte SMB value -SVALS(buf,pos) signed version of SVAL() -IVALS(buf,pos) signed version of IVAL() - -SSVAL(buf,pos,val) - put a 2 byte SMB value into a buffer -SIVAL(buf,pos,val) - put a 4 byte SMB value into a buffer -SSVALS(buf,pos,val) - signed version of SSVAL() -SIVALS(buf,pos,val) - signed version of SIVAL() - -RSVAL(buf,pos) - like SVAL() but for NMB byte ordering -RSVALS(buf,pos) - like SVALS() but for NMB byte ordering -RIVAL(buf,pos) - like IVAL() but for NMB byte ordering -RIVALS(buf,pos) - like IVALS() but for NMB byte ordering -RSSVAL(buf,pos,val) - like SSVAL() but for NMB ordering -RSIVAL(buf,pos,val) - like SIVAL() but for
[SCM] Samba Shared Repository - branch master updated - 1b99d8fbb591bedb375c1251d5d29a5674e1b74a
The branch, master has been updated
via 1b99d8fbb591bedb375c1251d5d29a5674e1b74a (commit)
via 652f0e601da0d1d2e2c8b9281bbee9fa399d9877 (commit)
via 7d371c684d6638c1def19b5900cbff14eaef0af3 (commit)
via a52e729f304c1edbd3842f837f4b2b11222bbc57 (commit)
from 1d0cda2f034c44e2274f90b5453e5b031446c034 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 1b99d8fbb591bedb375c1251d5d29a5674e1b74a
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Sun Oct 12 17:34:43 2008 +0200
Use common util_file code.
commit 652f0e601da0d1d2e2c8b9281bbee9fa399d9877
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Sun Oct 12 17:34:28 2008 +0200
Move nmblookup to same location as the rest of the NBT client library.
commit 7d371c684d6638c1def19b5900cbff14eaef0af3
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Sun Oct 12 16:53:17 2008 +0200
Sync util_tdb implementations.
commit a52e729f304c1edbd3842f837f4b2b11222bbc57
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Sun Oct 12 16:27:00 2008 +0200
Move rbtree.[ch] to lib/util.
---
Summary of changes:
lib/util/config.mk |1 +
lib/util/params.c|2 +-
lib/util/rbtree.c| 422 ++
lib/util/rbtree.h| 132
lib/util/util.h |8 +-
lib/util/util_file.c | 59 +++-
lib/util/util_tdb.c | 260 ++--
libcli/nbt/man/nmblookup.1.xml | 223 ++
libcli/nbt/tools/tools/nmblookup.c | 381 +++
source3/Makefile.in |6 +-
source3/include/proto.h | 14 +-
source3/include/rbtree.h | 132
source3/include/util_tdb.h | 32 +-
source3/intl/lang_tdb.c |6 +-
source3/lib/dbwrap_rbt.c |2 +-
source3/lib/memcache.c |2 +-
source3/lib/rbtree.c | 422 --
source3/lib/sysquotas.c |6 +-
source3/lib/util_file.c | 352 +-
source3/lib/util_tdb.c | 297 --
source3/libgpo/gpo_ini.c |4 +-
source3/param/loadparm.c |8 +-
source3/param/params.c |4 +-
source3/passdb/machine_sid.c |6 +-
source3/printing/nt_printing.c |8 +-
source3/printing/print_generic.c |6 +-
source3/printing/print_svid.c|8 +-
source3/rpc_server/srv_spoolss_nt.c | 18 +-
source3/smbd/dfree.c |2 +-
source3/smbd/lanman.c|6 +-
source3/smbd/map_username.c |4 +-
source3/utils/net_usershare.c|4 +-
source4/auth/credentials/credentials_files.c |2 +-
source4/lib/registry/dir.c |2 +-
source4/lib/registry/regf.c |2 +-
source4/lib/tls/tls.c|2 +-
source4/libcli/nbt/man/nmblookup.1.xml | 223 --
source4/libcli/nbt/tools/nmblookup.c | 381 ---
source4/torture/gentest.c|4 +-
39 files changed, 1323 insertions(+), 2130 deletions(-)
create mode 100644 lib/util/rbtree.c
create mode 100644 lib/util/rbtree.h
create mode 100644 libcli/nbt/man/nmblookup.1.xml
create mode 100644 libcli/nbt/tools/tools/nmblookup.c
delete mode 100644 source3/include/rbtree.h
delete mode 100644 source3/lib/rbtree.c
delete mode 100644 source4/libcli/nbt/man/nmblookup.1.xml
delete mode 100644 source4/libcli/nbt/tools/nmblookup.c
Changeset truncated at 500 lines:
diff --git a/lib/util/config.mk b/lib/util/config.mk
index 925713a..4918a4d 100644
--- a/lib/util/config.mk
+++ b/lib/util/config.mk
@@ -23,6 +23,7 @@ LIBSAMBA-UTIL_OBJ_FILES = $(addprefix $(libutilsrcdir)/, \
mutex.o \
idtree.o \
become_daemon.o \
+ rbtree.o \
params.o)
PUBLIC_HEADERS += $(addprefix $(libutilsrcdir)/, util.h \
diff --git a/lib/util/params.c b/lib/util/params.c
index 3a9e2b9..c03edec 100644
--- a/lib/util/params.c
+++ b/lib/util/params.c
@@ -510,7 +510,7 @@ static myFILE *OpenConfFile( const char *FileName )
ret = talloc(talloc_autofree_context(), myFILE);
if (!ret) return NULL;
- ret-buf = file_load(FileName, ret-size, ret);
+ ret-buf = file_load(FileName, ret-size, 0, ret);
if( NULL == ret-buf )
{
DEBUG( 1,
diff --git a/lib/util/rbtree.c
[SCM] Samba Shared Repository - branch master updated - 3b0a1b0363145e4ec606b9df97450bd6e2532167
The branch, master has been updated via 3b0a1b0363145e4ec606b9df97450bd6e2532167 (commit) from 1b99d8fbb591bedb375c1251d5d29a5674e1b74a (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 3b0a1b0363145e4ec606b9df97450bd6e2532167 Author: Jelmer Vernooij [EMAIL PROTECTED] Date: Sun Oct 12 17:50:41 2008 +0200 Make util_tdb.h static since it is now used by Samba3. --- Summary of changes: .gitignore |1 - lib/util/config.mk |2 - lib/util/util_tdb.h | 114 +++ 3 files changed, 114 insertions(+), 3 deletions(-) create mode 100644 lib/util/util_tdb.h Changeset truncated at 500 lines: diff --git a/.gitignore b/.gitignore index fa4fc5f..27ee256 100644 --- a/.gitignore +++ b/.gitignore @@ -235,7 +235,6 @@ lib/util/asn1_proto.h lib/util/pidfile.h lib/util/unix_privs.h lib/util/util_proto.h -lib/util/util_tdb.h source4/mkconfig.mk source4/nbt_server/dgram/proto.h source4/nbt_server/nbt_server_proto.h diff --git a/lib/util/config.mk b/lib/util/config.mk index 4918a4d..6873c1b 100644 --- a/lib/util/config.mk +++ b/lib/util/config.mk @@ -64,8 +64,6 @@ PUBLIC_DEPENDENCIES = LIBTDB UTIL_TDB_OBJ_FILES = $(libutilsrcdir)/util_tdb.o -$(eval $(call proto_header_template,$(libutilsrcdir)/util_tdb.h,$(UTIL_TDB_OBJ_FILES:.o=.c))) - [SUBSYSTEM::UTIL_LDB] PUBLIC_DEPENDENCIES = LIBLDB diff --git a/lib/util/util_tdb.h b/lib/util/util_tdb.h new file mode 100644 index 000..da6378e --- /dev/null +++ b/lib/util/util_tdb.h @@ -0,0 +1,114 @@ +#ifndef _LIB_UTIL_UTIL_TDB_H__ +#define _LIB_UTIL_UTIL_TDB_H__ + + +/*** + Make a TDB_DATA and keep the const warning in one place +/ +TDB_DATA make_tdb_data(const uint8_t *dptr, size_t dsize); +TDB_DATA string_tdb_data(const char *string); +TDB_DATA string_term_tdb_data(const char *string); + +/ + Lock a chain by string. Return -1 if lock failed. +/ +int tdb_lock_bystring(struct tdb_context *tdb, const char *keyval); + +/ + Unlock a chain by string. +/ +void tdb_unlock_bystring(struct tdb_context *tdb, const char *keyval); + +/ + Read lock a chain by string. Return -1 if lock failed. +/ +int tdb_read_lock_bystring(struct tdb_context *tdb, const char *keyval); + +/ + Read unlock a chain by string. +/ +void tdb_read_unlock_bystring(struct tdb_context *tdb, const char *keyval); + +/ + Fetch a int32_t value by a arbitrary blob key, return -1 if not found. + Output is int32_t in native byte order. +/ +int32_t tdb_fetch_int32_byblob(struct tdb_context *tdb, TDB_DATA key); + +/ + Fetch a int32_t value by string key, return -1 if not found. + Output is int32_t in native byte order. +/ +int32_t tdb_fetch_int32(struct tdb_context *tdb, const char *keystr); + +/ + Store a int32_t value by an arbitary blob key, return 0 on success, -1 on failure. + Input is int32_t in native byte order. Output in tdb is in little-endian. +/ +int tdb_store_int32_byblob(struct tdb_context *tdb, TDB_DATA key, int32_t v); + +/ + Store a int32_t value by string key, return 0 on success, -1 on failure. + Input is int32_t in native byte order. Output in tdb is in little-endian. +/ +int tdb_store_int32(struct tdb_context *tdb, const char *keystr, int32_t v); + +/ + Fetch a uint32_t value by a arbitrary blob key, return -1 if not found. + Output is uint32_t in native byte order. +/ +bool
[SCM] Samba Shared Repository - branch master updated - edff62a31ebe818c62de21878359be8477d77a2f
The branch, master has been updated
via edff62a31ebe818c62de21878359be8477d77a2f (commit)
from cbe4f1b4fae72a54e610725d3304fefd37aa4495 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit edff62a31ebe818c62de21878359be8477d77a2f
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Sun Oct 12 18:36:36 2008 +0200
Remove gencache in Samba 4 - it's unused and behind on the Samba 3
version.
---
Summary of changes:
source4/lib/gencache/gencache.c | 375 ---
source4/lib/gencache/gencache.h | 94 --
2 files changed, 0 insertions(+), 469 deletions(-)
delete mode 100644 source4/lib/gencache/gencache.c
delete mode 100644 source4/lib/gencache/gencache.h
Changeset truncated at 500 lines:
diff --git a/source4/lib/gencache/gencache.c b/source4/lib/gencache/gencache.c
deleted file mode 100644
index 40e..000
--- a/source4/lib/gencache/gencache.c
+++ /dev/null
@@ -1,375 +0,0 @@
-/*
- Unix SMB/CIFS implementation.
-
- Generic, persistent and shared between processes cache mechanism for use
- by various parts of the Samba code
-
- Copyright (C) Rafal Szczesniak2002
-
- 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/.
-*/
-
-#include includes.h
-#include system/time.h
-#include system/filesys.h
-#include tdb_wrap.h
-#include lib/gencache/gencache.h
-
-#define TIMEOUT_LEN 12
-#define CACHE_DATA_FMT %12u/%s
-
-static struct tdb_wrap *cache;
-
-/**
- * @file gencache.c
- * @brief Generic, persistent and shared between processes cache mechanism
- *for use by various parts of the Samba code
- *
- **/
-
-
-/**
- * Cache initialisation function. Opens cache tdb file or creates
- * it if does not exist.
- *
- * @return true on successful initialisation of the cache or
- * false on failure
- **/
-
-bool gencache_init(struct loadparm_context *lp_ctx)
-{
- char* cache_fname = NULL;
- TALLOC_CTX *mem_ctx = talloc_autofree_context();
-
- /* skip file open if it's already opened */
- if (cache) return true;
-
- cache_fname = lock_path(mem_ctx, lp_ctx, gencache.tdb);
- if (cache_fname != NULL) {
- DEBUG(5, (Opening cache file at %s\n, cache_fname));
- } else {
- DEBUG(0, (Filename allocation failed.\n));
- return false;
- }
-
- cache = tdb_wrap_open(mem_ctx, cache_fname, 0, TDB_DEFAULT,
- O_RDWR|O_CREAT, 0644);
-
- talloc_free(cache_fname);
- if (!cache) {
- DEBUG(5, (Attempt to open gencache.tdb has failed.\n));
- return false;
- }
- return true;
-}
-
-
-/**
- * Cache shutdown function. Closes opened cache tdb file.
- *
- * @return true on successful closing the cache or
- * false on failure during cache shutdown
- **/
-
-bool gencache_shutdown(void)
-{
- if (!cache) return false;
- DEBUG(5, (Closing cache file\n));
- talloc_free(cache);
- return true;
-}
-
-
-/**
- * Set an entry in the cache file. If there's no such
- * one, then add it.
- *
- * @param keystr string that represents a key of this entry
- * @param value text representation value being cached
- * @param timeout time when the value is expired
- *
- * @retval true when entry is successfuly stored
- * @retval false on failure
- **/
-
-bool gencache_set(const char *keystr, const char *value, time_t timeout)
-{
- int ret;
- TDB_DATA keybuf, databuf;
- char* valstr = NULL;
-
- /* fail completely if get null pointers passed */
- SMB_ASSERT(keystr value);
-
- if (!gencache_init()) return false;
-
- asprintf(valstr, CACHE_DATA_FMT, (int)timeout, value);
- if (!valstr)
- return false;
-
- keybuf.dptr = (uint8_t *)strdup(keystr);
- keybuf.dsize = strlen(keystr)+1;
- databuf.dptr = (uint8_t *)strdup(valstr);
- databuf.dsize = strlen(valstr)+1;
- DEBUG(10, (Adding cache entry with key = %s; value = %s and timeout \
- = %s (%d seconds %s)\n, keybuf.dptr, value, ctime(timeout),
- (int)(timeout - time(NULL)), timeout time(NULL) ? ahead
: in the past));
-
[SCM] Samba Shared Repository - branch master updated - cc6227d0bc94192675475d174f1de19797b0409b
The branch, master has been updated
via cc6227d0bc94192675475d174f1de19797b0409b (commit)
via 9f2ed1e00f586a67ab2d8c1f4770a570e6ae9740 (commit)
from edff62a31ebe818c62de21878359be8477d77a2f (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit cc6227d0bc94192675475d174f1de19797b0409b
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Sun Oct 12 19:06:00 2008 +0200
Ignore generated but unused files.
commit 9f2ed1e00f586a67ab2d8c1f4770a570e6ae9740
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Sun Oct 12 19:05:46 2008 +0200
Share RPC binding string utility functions.
---
Summary of changes:
.gitignore|4 +
{source4/librpc = librpc}/rpc/binding.c |6 +-
pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm |2 +-
source3/Makefile.in |2 +-
source3/include/proto.h |2 +-
source3/librpc/gen_ndr/srv_dfs.c | 46 +-
source3/librpc/gen_ndr/srv_dssetup.c | 22 +-
source3/librpc/gen_ndr/srv_echo.c | 20 +-
source3/librpc/gen_ndr/srv_epmapper.c | 16 +-
source3/librpc/gen_ndr/srv_eventlog.c | 48 +-
source3/librpc/gen_ndr/srv_initshutdown.c |6 +-
source3/librpc/gen_ndr/srv_lsa.c | 164
source3/librpc/gen_ndr/srv_netlogon.c | 94 ++--
source3/librpc/gen_ndr/srv_ntsvcs.c | 130 +++---
source3/librpc/gen_ndr/srv_samr.c | 136 +++---
source3/librpc/gen_ndr/srv_srvsvc.c | 108 +++---
source3/librpc/gen_ndr/srv_svcctl.c | 88 ++--
source3/librpc/gen_ndr/srv_winreg.c | 70 ++--
source3/librpc/gen_ndr/srv_wkssvc.c | 62 ++--
source3/librpc/ndr/ndr.c | 12 +-
source3/librpc/ndr/ndr_compression.c |6 +-
source3/librpc/rpc/binding.c | 709 -
source3/librpc/rpc/dcerpc.c |2 +-
source3/librpc/rpc/dcerpc.h | 48 ++
source3/rpc_client/ndr.c |2 +-
source4/librpc/config.mk |5 +-
26 files changed, 577 insertions(+), 1233 deletions(-)
rename {source4/librpc = librpc}/rpc/binding.c (99%)
delete mode 100644 source3/librpc/rpc/binding.c
Changeset truncated at 500 lines:
diff --git a/.gitignore b/.gitignore
index 27ee256..b61bf4e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -307,3 +307,7 @@ tags
packaging/RHEL-CTDB/samba.spec
packaging/RHEL/samba.spec
packaging/RHEL/makerpms.sh
+source3/librpc/gen_ndr/cli_drsblobs.c
+source3/librpc/gen_ndr/cli_drsblobs.h
+source3/librpc/gen_ndr/srv_drsblobs.c
+source3/librpc/gen_ndr/srv_drsblobs.h
diff --git a/source4/librpc/rpc/binding.c b/librpc/rpc/binding.c
similarity index 99%
rename from source4/librpc/rpc/binding.c
rename to librpc/rpc/binding.c
index bfe62c4..b755431 100644
--- a/source4/librpc/rpc/binding.c
+++ b/librpc/rpc/binding.c
@@ -23,10 +23,10 @@
*/
#include includes.h
-#include lib/events/events.h
-#include librpc/gen_ndr/ndr_epmapper_c.h
-#include librpc/gen_ndr/ndr_dcerpc.h
+#include librpc/gen_ndr/ndr_epmapper.h
#include librpc/gen_ndr/ndr_misc.h
+#include librpc/rpc/dcerpc.h
+#undef strcasecmp
#define MAX_PROTSEQ10
diff --git a/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
b/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
index c565d8a..6034fb6 100644
--- a/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
+++ b/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
@@ -171,7 +171,7 @@ sub ParseFunction($$)
pidl \tNDR_PRINT_OUT_DEBUG($fn-{NAME}, r);;
pidl };
pidl ;
- pidl push = ndr_push_init_ctx(r);;
+ pidl push = ndr_push_init_ctx(r, NULL);;
pidl if (push == NULL) {;
pidl \ttalloc_free(r);;
pidl \treturn false;;
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 3297278..846d1e0 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -433,7 +433,7 @@ LIBMSRPC_OBJ = rpc_client/cli_lsarpc.o
rpc_client/cli_samr.o \
rpc_client/cli_svcctl.o \
rpc_client/init_samr.o \
librpc/rpc/dcerpc.o \
- librpc/rpc/binding.o
+ ../librpc/rpc/binding.o
LIBMSRPC_GEN_OBJ = librpc/gen_ndr/cli_lsa.o \
librpc/gen_ndr/cli_dfs.o \
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 0a5c401..cc931ff 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -3760,7 +3760,7 @@ _PUBLIC_ struct ndr_pull *ndr_pull_init_blob(const
DATA_BLOB *blob, TALLOC_CTX *
_PUBLIC_ enum ndr_err_code ndr_pull_advance(struct ndr_pull *ndr, uint32_t
size);
_PUBLIC_ void ndr_pull_save(struct ndr_pull *ndr, struct ndr_pull_save *save);
_PUBLIC_ void ndr_pull_restore(struct ndr_pull *ndr, struct ndr_pull_save
*save);
-_PUBLIC_ struct ndr_push *ndr_push_init_ctx(TALLOC_CTX *mem_ctx);
+_PUBLIC_
[SCM] Samba Shared Repository - branch master updated - 99fba0ca69516e571d88ecaea3937f1f73287cf3
The branch, master has been updated
via 99fba0ca69516e571d88ecaea3937f1f73287cf3 (commit)
via 6f13c389d9feb84e4e84e3484dc7ddb6839f58ad (commit)
from cc6227d0bc94192675475d174f1de19797b0409b (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 99fba0ca69516e571d88ecaea3937f1f73287cf3
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Sun Oct 12 19:37:17 2008 +0200
Remove Samba3/Samba4-specific bits.
commit 6f13c389d9feb84e4e84e3484dc7ddb6839f58ad
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Sun Oct 12 19:36:12 2008 +0200
Fix other paths to binding.o.
---
Summary of changes:
source3/Makefile.in|8
source3/librpc/tools/ndrdump.c | 14 +++---
2 files changed, 7 insertions(+), 15 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 846d1e0..97e8ccb 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -734,7 +734,7 @@ SMBCONTROL_OBJ = utils/smbcontrol.o $(LOCKING_OBJ)
$(PARAM_OBJ) \
SMBTREE_OBJ = utils/smbtree.o $(PARAM_OBJ) \
$(PROFILE_OBJ) $(LIB_NONSMBD_OBJ) $(LIBSMB_OBJ) \
$(KRBCLIENT_OBJ) $(POPT_LIB_OBJ) \
- rpc_client/cli_pipe.o librpc/rpc/binding.o $(RPC_PARSE_OBJ2) \
+ rpc_client/cli_pipe.o ../librpc/rpc/binding.o $(RPC_PARSE_OBJ2) \
$(RPC_CLIENT_OBJ1) \
$(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(SMBLDAP_OBJ) $(LDB_OBJ)
$(GROUPDB_OBJ) \
$(LIBMSRPC_GEN_OBJ)
@@ -818,7 +818,7 @@ LIBBIGBALLOFMUD_OBJ = $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
$(GROUPDB_OBJ) $(KRBCLIENT_OBJ) $(SMBLDAP_OBJ) $(LDB_OBJ)
CLIENT_OBJ1 = client/client.o client/clitar.o rpc_client/cli_pipe.o \
- librpc/rpc/binding.o \
+ ../librpc/rpc/binding.o \
client/dnsbrowse.o \
$(RPC_CLIENT_OBJ1) \
$(RPC_PARSE_OBJ2)
@@ -,7 +,7 @@ NTLM_AUTH_OBJ = ${NTLM_AUTH_OBJ1} $(LIBSAMBA_OBJ)
$(POPT_LIB_OBJ) \
$(LIBNDR_GEN_OBJ0) $(LIBNDR_GEN_OBJ1)
-VLP_OBJ1 = ../testsuite/printing/vlp.o $(RPC_CLIENT_OBJ1) $(RPC_PARSE_OBJ2)
$(RPC_CLIENT_OBJ) librpc/rpc/binding.o
+VLP_OBJ1 = ../testsuite/printing/vlp.o $(RPC_CLIENT_OBJ1) $(RPC_PARSE_OBJ2)
$(RPC_CLIENT_OBJ) ../librpc/rpc/binding.o
VLP_OBJ = $(VLP_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) \
$(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) $(LIBMSRPC_GEN_OBJ) \
@@ -1129,7 +1129,7 @@ RPC_OPEN_TCP_OBJ = torture/rpc_open_tcp.o \
$(RPC_PARSE_OBJ2) \
$(RPC_CLIENT_OBJ1) \
rpc_client/cli_pipe.o \
- librpc/rpc/binding.o \
+ ../librpc/rpc/binding.o \
$(LIBMSRPC_GEN_OBJ)
diff --git a/source3/librpc/tools/ndrdump.c b/source3/librpc/tools/ndrdump.c
index 08b969a..5b96e15 100644
--- a/source3/librpc/tools/ndrdump.c
+++ b/source3/librpc/tools/ndrdump.c
@@ -281,11 +281,7 @@ static const struct ndr_interface_table
*load_iface_from_plugin(const char *plug
exit(1);
}
-#if (_SAMBA_BUILD_ = 4)
- data = (uint8_t *)file_load(ctx_filename, size, mem_ctx);
-#else
- data = (uint8_t *)file_load(ctx_filename, size, 0);
-#endif
+ data = (uint8_t *)file_load(ctx_filename, size, 0, mem_ctx);
if (!data) {
perror(ctx_filename);
exit(1);
@@ -312,11 +308,7 @@ static const struct ndr_interface_table
*load_iface_from_plugin(const char *plug
}
if (filename)
-#if (_SAMBA_BUILD_ = 4)
- data = (uint8_t *)file_load(filename, size, mem_ctx);
-#else
- data = (uint8_t *)file_load(filename, size, 0);
-#endif
+ data = (uint8_t *)file_load(filename, size, 0, mem_ctx);
else
data = (uint8_t *)stdin_load(mem_ctx, size);
@@ -368,7 +360,7 @@ static const struct ndr_interface_table
*load_iface_from_plugin(const char *plug
uint8_t byte_a, byte_b;
bool differ;
- ndr_v_push = ndr_push_init_ctx(mem_ctx);
+ ndr_v_push = ndr_push_init_ctx(mem_ctx, NULL);
ndr_err = f-ndr_push(ndr_v_push, flags, st);
status = ndr_map_error2ntstatus(ndr_err);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - 3994c42f1938e35218cd5708fcc5a22b1b9a761d
The branch, master has been updated
via 3994c42f1938e35218cd5708fcc5a22b1b9a761d (commit)
from 99fba0ca69516e571d88ecaea3937f1f73287cf3 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 3994c42f1938e35218cd5708fcc5a22b1b9a761d
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Sun Oct 12 19:46:38 2008 +0200
Fix number of arguments for file_load() functions.
---
Summary of changes:
lib/util/tests/file.c |2 +-
libcli/nbt/tools/{ = }/tools/nmblookup.c |0
source4/lib/torture/torture.h |4 ++--
source4/librpc/tools/ndrdump.c| 12 ++--
source4/torture/auth/pac.c|2 +-
source4/torture/basic/misc.c |2 +-
source4/torture/locktest.c|2 +-
source4/torture/util_smb.c|2 +-
8 files changed, 9 insertions(+), 17 deletions(-)
rename libcli/nbt/tools/{ = }/tools/nmblookup.c (100%)
Changeset truncated at 500 lines:
diff --git a/lib/util/tests/file.c b/lib/util/tests/file.c
index 3377e83..9a303bf 100644
--- a/lib/util/tests/file.c
+++ b/lib/util/tests/file.c
@@ -42,7 +42,7 @@ static bool test_file_load_save(struct torture_context *tctx)
torture_assert_file_contains_text(tctx, TEST_FILENAME, TEST_DATA,
file
contents);
- data = file_load(TEST_FILENAME, len, mem_ctx);
+ data = file_load(TEST_FILENAME, len, 0, mem_ctx);
torture_assert(tctx, data, loading file);
torture_assert_int_equal(tctx, len, strlen(TEST_DATA), Length);
diff --git a/libcli/nbt/tools/tools/nmblookup.c b/libcli/nbt/tools/nmblookup.c
similarity index 100%
rename from libcli/nbt/tools/tools/nmblookup.c
rename to libcli/nbt/tools/nmblookup.c
diff --git a/source4/lib/torture/torture.h b/source4/lib/torture/torture.h
index f023f31..0f966a5 100644
--- a/source4/lib/torture/torture.h
+++ b/source4/lib/torture/torture.h
@@ -267,7 +267,7 @@ void torture_result(struct torture_context *test,
char *__got; \
const char *__expected = (expected); \
size_t __size; \
- __got = file_load(filename, __size, torture_ctx); \
+ __got = file_load(filename, __size, 0, torture_ctx); \
if (__got == NULL) { \
torture_result(torture_ctx, TORTURE_FAIL, \
__location__: unable to open %s: %s\n, \
@@ -288,7 +288,7 @@ void torture_result(struct torture_context *test,
#define torture_assert_file_contains(torture_ctx,filename,expected,cmt)\
do { const char *__got, *__expected = (expected); \
size_t __size; \
- __got = file_load(filename, *size, torture_ctx); \
+ __got = file_load(filename, *size, 0, torture_ctx); \
if (strcmp_safe(__got, __expected) != 0) { \
torture_result(torture_ctx, TORTURE_FAIL, \
__location__: %s
contained:\n%sExpected: %s%s\n, \
diff --git a/source4/librpc/tools/ndrdump.c b/source4/librpc/tools/ndrdump.c
index bc14369..b24868e 100644
--- a/source4/librpc/tools/ndrdump.c
+++ b/source4/librpc/tools/ndrdump.c
@@ -291,11 +291,7 @@ static void ndrdump_data(uint8_t *d, uint32_t l, bool
force)
exit(1);
}
-#if (_SAMBA_BUILD_ = 4)
- data = (uint8_t *)file_load(ctx_filename, size, mem_ctx);
-#else
- data = (uint8_t *)file_load(ctx_filename, size, 0);
-#endif
+ data = (uint8_t *)file_load(ctx_filename, size, 0, mem_ctx);
if (!data) {
perror(ctx_filename);
exit(1);
@@ -322,11 +318,7 @@ static void ndrdump_data(uint8_t *d, uint32_t l, bool
force)
}
if (filename)
-#if (_SAMBA_BUILD_ = 4)
- data = (uint8_t *)file_load(filename, size, mem_ctx);
-#else
- data = (uint8_t *)file_load(filename, size, 0);
-#endif
+ data = (uint8_t *)file_load(filename, size, 0, mem_ctx);
else
data = (uint8_t *)stdin_load(mem_ctx, size);
diff --git a/source4/torture/auth/pac.c b/source4/torture/auth/pac.c
index 42901f1..f6f2fcb 100644
--- a/source4/torture/auth/pac.c
+++ b/source4/torture/auth/pac.c
@@ -379,7 +379,7 @@ static bool torture_pac_saved_check(struct torture_context
*tctx)
pac_file = torture_setting_string(tctx, pac_file, NULL);
if (pac_file) {
- tmp_blob.data = (uint8_t *)file_load(pac_file,
tmp_blob.length, mem_ctx);
+ tmp_blob.data = (uint8_t *)file_load(pac_file,
tmp_blob.length, 0, mem_ctx);
torture_comment(tctx, (saved test) Loaded pac of size %ld from
%s\n, (long)tmp_blob.length, pac_file);
} else {
tmp_blob =
[SCM] CTDB repository - annotated tag ctdb-1.0.59 created - ctdb-1.0.59
The annotated tag, ctdb-1.0.59 has been created at 3b7c694e9ff0249f277c3bbcea821b6870dc68a1 (tag) tagging dc108adada33bb713f71a2859eda3b439ed0cd1a (commit) replaces ctdb-1.0.57 tagged by Ronnie Sahlberg on Mon Oct 13 08:18:03 2008 +1100 - Log - tag for the 1.0.59 release -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.6 (GNU/Linux) iD8DBQBI8mmb2aJ36aon/y8RAtKTAJ4gl/FZDYmVL+zDR5jZ3bzK0jvc9QCfQLvr doDVA1tbg6unuBVQfSs0xUM= =X/At -END PGP SIGNATURE- Andrew Tridgell (2): expanded ctdb_diagnostics based on recent experience merged a bugfix for the idtree code from the Linux kernel. This Martin Schwenke (9): Signed-off-by: Martin Schwenke [EMAIL PROTECTED] Signed-off-by: Martin Schwenke [EMAIL PROTECTED] Signed-off-by: Martin Schwenke [EMAIL PROTECTED] Minor documentation fixes. Merge commit 'origin/master' into for-ronnie Changes to onnode. Add healthy and connected as possible Merge commit 'origin/master' into for-ronnie onnode changes. ok is an alias for healthy, con is an alias for Document the new descriptive node specifications. Ronnie Sahlberg (24): add a link to my webpage Add a reload option to the initscript. From Abhijith Das [EMAIL PROTECTED]: rename ctdb_tcp_client back to the original name ctdb_control_tcp new version 1.0.58 zero out the address structure to keep valgrind happy From C Cowan. additional monitoring between the two daemons. lower the debug level for when printing that the nodeflags have changed lower the debuglevel when logging unknown idr in responses i add a new ctdb command ctdb recmaster updates to the precompiled documentation From Volker L fix some slow memory leaks in the vacuuming handler in the recovery fix a slow memory leak in the recovery daemon in the error paths for the The ctdb daemon keeps track of whether the recovery process is running use the correct tunable failcount not timeout Check that a database exists first before we dump its content (and add a new eventscript : 99.routing that is used to add static routes to When we reload the nodes file remove an unused variable new version 1.0.59 from Michael Adams : allow #-style comments in the nodes and public skip empty lines in the public addresses file, not skip all non-empty --- -- CTDB repository
[SCM] CTDB repository - branch master updated - ctdb-1.0.59-2-gdc9cd47
The branch, master has been updated
via dc9cd4779db4a89697731e4cf415be51067a07c1 (commit)
via 07dd4c7d2e8ba10f53d4cf2644fc4b7b8647e286 (commit)
from dc108adada33bb713f71a2859eda3b439ed0cd1a (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master
- Log -
commit dc9cd4779db4a89697731e4cf415be51067a07c1
Author: Ronnie Sahlberg [EMAIL PROTECTED]
Date: Mon Oct 13 08:27:33 2008 +1100
from Mathieu Parent [EMAIL PROTECTED]
Hi,
I have attached a patch necessary as debian log dir (/var/log) is not
a subdir of VARDIR (/var/lib on rpm systems, /var/lib/ctdb on debian).
As I don't know much about autotools and friends, this patch may be
hacky.
This is part of the process to minimize diff between distributions.
commit 07dd4c7d2e8ba10f53d4cf2644fc4b7b8647e286
Author: Ronnie Sahlberg [EMAIL PROTECTED]
Date: Mon Oct 13 08:21:20 2008 +1100
From Mathieu Parent
patch to make debian systems log the package versions in
ctdb_diagnostics
---
Summary of changes:
Makefile.in|5 +++--
server/ctdbd.c |2 +-
tools/ctdb_diagnostics |5 +
3 files changed, 9 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/Makefile.in b/Makefile.in
index cf1240b..e51fec9 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -12,6 +12,7 @@ bindir = @bindir@
sbindir = @sbindir@
mandir = @mandir@
localstatedir = @localstatedir@
+logdir = @logdir@
VPATH = @srcdir@:@tdbdir@:@tallocdir@:@libreplacedir@:@poptdir@
srcdir = @srcdir@
etcdir = @sysconfdir@
@@ -29,8 +30,8 @@ IPQ_LIBS = @IPQ_LIBS@
CFLAGS=-g -I$(srcdir)/include -Iinclude -Ilib -Ilib/util -I$(srcdir) \
[EMAIL PROTECTED]@ [EMAIL PROTECTED]@/include [EMAIL PROTECTED]@ \
- -DVARDIR=\$(localstatedir)\ -DETCDIR=\$(etcdir)\ \
- -DUSE_MMAP=1 @CFLAGS@ $(POPT_CFLAGS)
+ -DVARDIR=\$(localstatedir)\ -DLOGDIR=\$(logdir)\ \
+ -DETCDIR=\$(etcdir)\ -DUSE_MMAP=1 @CFLAGS@ $(POPT_CFLAGS)
[EMAIL PROTECTED]@ -Llib @LIBS@ $(POPT_LIBS) @INFINIBAND_LIBS@
@CTDB_PCAP_LDFLAGS@
diff --git a/server/ctdbd.c b/server/ctdbd.c
index 4dc0f74..48e361f 100644
--- a/server/ctdbd.c
+++ b/server/ctdbd.c
@@ -50,7 +50,7 @@ static struct {
.nlist = ETCDIR /ctdb/nodes,
.transport = tcp,
.event_script_dir = ETCDIR /ctdb/events.d,
- .logfile = VARDIR /log/log.ctdb,
+ .logfile = LOGDIR /log.ctdb,
.db_dir = VARDIR /ctdb,
.db_dir_persistent = VARDIR /ctdb/persistent,
};
diff --git a/tools/ctdb_diagnostics b/tools/ctdb_diagnostics
index 437580f..4415a90 100755
--- a/tools/ctdb_diagnostics
+++ b/tools/ctdb_diagnostics
@@ -93,6 +93,11 @@ show_all uname -a
[ -x /bin/rpm ] {
show_all rpm -qa | egrep 'samba|ctdb|gpfs'
}
+[ -x /usr/bin/dpkg-query ] {
+show_all /usr/bin/dpkg-query --show 'ctdb'
+show_all /usr/bin/dpkg-query --show 'samba'
+#show_all /usr/bin/dpkg-query --show 'gpfs'
+}
cat EOF
--
CTDB repository
[SCM] Samba Shared Repository - branch master updated - d5a11f9679be9d053838074f1dad5a0ca880750f
The branch, master has been updated
via d5a11f9679be9d053838074f1dad5a0ca880750f (commit)
via f97d92ccbc1779f88a76703f2f83db170cf1abaf (commit)
from 3994c42f1938e35218cd5708fcc5a22b1b9a761d (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit d5a11f9679be9d053838074f1dad5a0ca880750f
Author: Günther Deschner [EMAIL PROTECTED]
Date: Mon Oct 13 00:40:57 2008 +0200
fix build warnings.
Guenther
commit f97d92ccbc1779f88a76703f2f83db170cf1abaf
Author: Günther Deschner [EMAIL PROTECTED]
Date: Mon Oct 13 00:39:37 2008 +0200
s3: fix the build of registry.so gpext.
Guenther
---
Summary of changes:
lib/util/xfile.c|4 ++--
source3/libads/ldap.c |2 +-
source3/libgpo/gpext/registry.c |4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/util/xfile.c b/lib/util/xfile.c
index 36d56e5..e8bb811 100644
--- a/lib/util/xfile.c
+++ b/lib/util/xfile.c
@@ -105,7 +105,7 @@ XFILE *x_fopen(const char *fname, int flags, mode_t mode)
{
XFILE *ret;
- ret = malloc_p(XFILE);
+ ret = (XFILE *)malloc_p(XFILE);
if (!ret) return NULL;
memset(ret, 0, sizeof(XFILE));
@@ -403,7 +403,7 @@ XFILE *x_fdup(const XFILE *f)
return NULL;
}
- ret = malloc_p(XFILE);
+ ret = (XFILE *)malloc_p(XFILE);
if (!ret) {
close(fd);
return NULL;
diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
index e78465f..fbbe1a5 100644
--- a/source3/libads/ldap.c
+++ b/source3/libads/ldap.c
@@ -801,7 +801,7 @@ static ADS_STATUS ads_do_paged_search_args(ADS_STRUCT *ads,
int *count, struct berval **cookie)
{
int rc, i, version;
- char *utf8_expr, *utf8_path, **search_attrs;
+ char *utf8_expr, *utf8_path, **search_attrs = NULL;
size_t converted_size;
LDAPControl PagedResults, NoReferrals, ExternalCtrl, *controls[4],
**rcontrols;
BerElement *cookie_be = NULL;
diff --git a/source3/libgpo/gpext/registry.c b/source3/libgpo/gpext/registry.c
index 188a48a..f501498 100644
--- a/source3/libgpo/gpext/registry.c
+++ b/source3/libgpo/gpext/registry.c
@@ -410,7 +410,7 @@ static NTSTATUS reg_parse_registry(TALLOC_CTX *mem_ctx,
return status;
}
- buf = (uint16 *)file_load(real_filename, n, 0);
+ buf = (uint16 *)file_load(real_filename, n, 0, NULL);
if (!buf) {
TALLOC_FREE(reg_file);
return NT_STATUS_CANNOT_LOAD_REGISTRY_FILE;
@@ -455,7 +455,7 @@ static NTSTATUS reg_parse_registry(TALLOC_CTX *mem_ctx,
status = NT_STATUS_OK;
out:
- SAFE_FREE(buf);
+ TALLOC_FREE(buf);
prs_mem_free(ps);
return status;
--
Samba Shared Repository
Build status as of Mon Oct 13 00:00:02 2008
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2008-10-12 00:00:15.0 + +++ /home/build/master/cache/broken_results.txt 2008-10-13 00:01:14.0 + @@ -1,22 +1,22 @@ -Build status as of Sun Oct 12 00:00:03 2008 +Build status as of Mon Oct 13 00:00:02 2008 Build counts: Tree Total Broken Panic build_farm 0 0 0 -ccache 33 7 0 +ccache 34 7 0 ctdb 0 0 0 distcc 1 0 0 ldb 34 33 0 libreplace 33 12 0 lorikeet-heimdal 30 20 0 -pidl 20 3 0 +pidl 19 3 0 ppp 14 14 0 -rsync34 9 0 +rsync33 9 0 samba-docs 0 0 0 -samba-gtk7 7 0 -samba_3_X_devel 29 27 0 -samba_3_X_test 30 18 0 -samba_4_0_test 32 31 0 +samba-gtk8 8 0 +samba_3_X_devel 30 22 0 +samba_3_X_test 30 16 0 +samba_4_0_test 33 29 1 smb-build32 7 0 talloc 34 33 0 tdb 34 12 0
[SCM] Samba Shared Repository - branch master updated - aa982895e5c13497144740e90ff9646e1d1cf995
The branch, master has been updated
via aa982895e5c13497144740e90ff9646e1d1cf995 (commit)
from d5a11f9679be9d053838074f1dad5a0ca880750f (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit aa982895e5c13497144740e90ff9646e1d1cf995
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Mon Oct 13 05:20:26 2008 +0200
Add data_blob_string_const_null() function that includes the terminating
null byte and use it in Samba 3.
This matches the behaviour prior to my data_blob changes.
---
Summary of changes:
lib/util/data_blob.c | 12
lib/util/data_blob.h |8
source3/auth/token_util.c|4 ++--
source3/lib/access.c |6 +++---
source3/lib/util_pw.c|4 ++--
source3/lib/util_sock.c | 12 ++--
source3/rpc_server/srv_samr_nt.c |4 ++--
source3/torture/torture.c|2 +-
8 files changed, 36 insertions(+), 16 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/util/data_blob.c b/lib/util/data_blob.c
index 1b2f055..c7d01ba 100644
--- a/lib/util/data_blob.c
+++ b/lib/util/data_blob.c
@@ -183,6 +183,18 @@ _PUBLIC_ DATA_BLOB data_blob_string_const(const char *str)
}
/**
+ useful for constructing data blobs in test suites, while
+ avoiding const warnings
+**/
+_PUBLIC_ DATA_BLOB data_blob_string_const_null(const char *str)
+{
+ DATA_BLOB blob;
+ blob.data = discard_const_p(uint8_t, str);
+ blob.length = str ? strlen(str)+1 : 0;
+ return blob;
+}
+
+/**
* Create a new data blob from const data
*/
diff --git a/lib/util/data_blob.h b/lib/util/data_blob.h
index 58c1117..ffde51c 100644
--- a/lib/util/data_blob.h
+++ b/lib/util/data_blob.h
@@ -105,6 +105,14 @@ _PUBLIC_ char *data_blob_hex_string(TALLOC_CTX *mem_ctx,
const DATA_BLOB *blob);
_PUBLIC_ DATA_BLOB data_blob_string_const(const char *str);
/**
+ useful for constructing data blobs in test suites, while
+ avoiding const warnings
+
+ includes the terminating null character (as opposed to data_blo_string_const)
+**/
+_PUBLIC_ DATA_BLOB data_blob_string_const_null(const char *str);
+
+/**
* Create a new data blob from const data
*/
_PUBLIC_ DATA_BLOB data_blob_const(const void *p, size_t length);
diff --git a/source3/auth/token_util.c b/source3/auth/token_util.c
index d6cd2ea..e739fda 100644
--- a/source3/auth/token_util.c
+++ b/source3/auth/token_util.c
@@ -84,7 +84,7 @@ NT_USER_TOKEN *get_root_nt_token( void )
cache_data = memcache_lookup_talloc(
NULL, SINGLETON_CACHE_TALLOC,
- data_blob_string_const(root_nt_token));
+ data_blob_string_const_null(root_nt_token));
if (cache_data != NULL) {
return talloc_get_type_abort(
@@ -109,7 +109,7 @@ NT_USER_TOKEN *get_root_nt_token( void )
memcache_add_talloc(
NULL, SINGLETON_CACHE_TALLOC,
- data_blob_string_const(root_nt_token), token);
+ data_blob_string_const_null(root_nt_token), token);
return token;
}
diff --git a/source3/lib/access.c b/source3/lib/access.c
index 6a445f8..966d8ce 100644
--- a/source3/lib/access.c
+++ b/source3/lib/access.c
@@ -104,7 +104,7 @@ static bool string_match(const char *tok,const char *s)
if (memcache_lookup(
NULL, SINGLETON_CACHE,
- data_blob_string_const(yp_default_domain),
+ data_blob_string_const_null(yp_default_domain),
tmp)) {
SMB_ASSERT(tmp.length 0);
@@ -116,8 +116,8 @@ static bool string_match(const char *tok,const char *s)
memcache_add(
NULL, SINGLETON_CACHE,
- data_blob_string_const(yp_default_domain),
- data_blob_string_const(mydomain?mydomain:));
+
data_blob_string_const_null(yp_default_domain),
+
data_blob_string_const_null(mydomain?mydomain:));
}
if (!mydomain) {
diff --git a/source3/lib/util_pw.c b/source3/lib/util_pw.c
index 4283785..c0d37f1 100644
--- a/source3/lib/util_pw.c
+++ b/source3/lib/util_pw.c
@@ -47,7 +47,7 @@ struct passwd *getpwnam_alloc(TALLOC_CTX *mem_ctx, const char
*name)
struct passwd *temp, *cached;
temp = (struct passwd *)memcache_lookup_talloc(
- NULL, GETPWNAM_CACHE, data_blob_string_const(name));
+ NULL, GETPWNAM_CACHE, data_blob_string_const_null(name));
if (temp != NULL) {
return tcopy_passwd(mem_ctx, temp);
}
@@ -65,7 +65,7 @@ struct passwd *getpwnam_alloc(TALLOC_CTX *mem_ctx, const char
*name)
[SCM] Samba Shared Repository - branch master updated - f6575a270fdfb41e28e1eaeb6d3653db32bb6337
The branch, master has been updated
via f6575a270fdfb41e28e1eaeb6d3653db32bb6337 (commit)
from aa982895e5c13497144740e90ff9646e1d1cf995 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit f6575a270fdfb41e28e1eaeb6d3653db32bb6337
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Mon Oct 13 05:31:01 2008 +0200
Use DATA_BLOB instead of struct data_blob.
---
Summary of changes:
source3/lib/ctdbd_conn.c |8
1 files changed, 4 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index 5075476..10a65c5 100644
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -155,7 +155,7 @@ static NTSTATUS ctdbd_connect(TALLOC_CTX *mem_ctx,
* Do we have a complete ctdb packet in the queue?
*/
-static bool ctdb_req_complete(const struct data_blob *data,
+static bool ctdb_req_complete(const DATA_BLOB *data,
size_t *length,
void *private_data)
{
@@ -220,7 +220,7 @@ struct req_pull_state {
* Pull a ctdb request out of the incoming packet queue
*/
-static NTSTATUS ctdb_req_pull(const struct data_blob *data,
+static NTSTATUS ctdb_req_pull(const DATA_BLOB *data,
void *private_data)
{
struct req_pull_state *state = (struct req_pull_state *)private_data;
@@ -497,7 +497,7 @@ NTSTATUS ctdbd_messaging_connection(TALLOC_CTX *mem_ctx,
/*
* Packet handler to receive and handle a ctdb message
*/
-static NTSTATUS ctdb_handle_message(const struct data_blob *data,
+static NTSTATUS ctdb_handle_message(const DATA_BLOB *data,
void *private_data)
{
struct ctdbd_connection *conn = talloc_get_type_abort(
@@ -1025,7 +1025,7 @@ struct ctdbd_traverse_state {
* Handle a traverse record coming in on the ctdbd connection
*/
-static NTSTATUS ctdb_traverse_handler(const struct data_blob *blob,
+static NTSTATUS ctdb_traverse_handler(const DATA_BLOB *blob,
void *private_data)
{
struct ctdbd_traverse_state *state =
--
Samba Shared Repository
