[Samba] OpenLDAP and Samba - password expiration.
Hi all, I have a Samba PDC with an LDAP backend. Yesterday, I tried to add a new machine to the network and received the following message: The following error occurred attempting to join the domain: The password of this user has expired Not a problem I thought, and then ran smbldap-usermod -e 2010-12-30 00:00:00 root to extend the password date. If I now try to connect a machine with the root account I receive an error user doesn't exist. If I go to a machine that's already connected to the network and log in as root it lets me in and I can see root's home directory and access the shares. I have the ldif file backed up so I can restore myself back to the initial state whenever I like. Any suggetions would be gratefully received regarding how I can get around this one. Thanks in advance, Jools -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] pam_mkhomedir.so problem
Hello Samba People, I'm doing some tests with samba on a debian Sarge in order to implement a file server with the recycle bin module, so my smb.conf loks like this : [global] workgroup = HOME server string = %h server (Samba %v) preferred master = no realm = home.local security = ADS encrypt passwords = true password server = 192.168.0.15 socket options = TCP_NODELAY # winbindd configuration winbind separator = _ idmap uid = 1-2 idmap gid = 1-2 winbind enum users = yes winbind enum groups = yes template homedir = /home/%U template shell = /bin/false dns proxy = no log file = /var/log/samba/log.%m.%U log level = 2 vfs: 3 max log size = 2048 syslog = 0 panic action = /usr/share/samba/panic-action %d [homes] comment = Home Directories browseable = no writable = yes create mask = 0700 directory mask = 0700 [share] path = /home/share comment = Share Directories browseable = yes writable = yes create mask = 0777 directory mask = 0777 vfs objects = extd_audit recycle recycle:exclude = *.tmp,*.temp recycle:keeptree = yes recycle:repository = /home/recycle/%U recycle:touch = yes recycle:versions = yes I edited /etc/pam.d/samba, which now looks like : accountrequiredpam_unix.so password sufficient pam_winbind.so use_authtok auth requiredpam_unix.so nullok_secure sessionrequiredpam_mkhomedir.so skel=/etc/skel/ umask=0077 @include common-auth @include common-account @include common-session Everything works super except the pam_mkhomedir.so module, which does not create the /home/%USERNAME% folder automaticaly ... In the log samba sais that /home/X does not exist ... and this folder is not created ... If I create it manualy and give appropiate rights, it works as it shood ... Where is the problem ? -- All parts should go together without forcing. You must remember that the parts you are reassembling were disassembled by you. Therefore, if you can't get them together again, there must be a reason. By all means, do not use a hammer. -- IBM maintenance manual, 1975 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Problems with MySQL backend.
On Fri, Dec 30, 2005 at 02:27:37PM +0100, Mario Lipinski wrote: After all i want to stay with MySQL now. Are there any reasons from the point of database structure and SQL itself not to use it as a backend, apart from the status of the backend itself now? It needs a maintainer who will support it and fix bugs. Without that it is always in danger of breaking and being removed from the tree. We *really* need someone to step up to this, none of the regular Team have time available at the moment to do this. Jeremy. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] joined to ads, mapped permissions
I have joined samba to a 2003 active directory server. If a samba shared dir is owned by root, how does active directory manage it? more specifically, how are the permissions mapped? administrator to root? i have seen reference to a parameter in smb.conf to username map, but i don't see reference to it in either of the John Terpstra Samba books so that can't be the bridge between windows and linux permisssions. TIA -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] 3.0.21a make fails on Mac OS X 10.4.3
Currently running 3.0.10 that comes standard with Mac OS X 10.4 (Tiger). Attempted to install 3.0.21a last night and make failed like this: Compiling libsmb/clikrb5.c libsmb/clikrb5.c: In function 'krb5_locate_kdc': libsmb/clikrb5.c:306: error: 'krb5_krbhst_handle' undeclared (first use in this function) libsmb/clikrb5.c:306: error: (Each undeclared identifier is reported only once libsmb/clikrb5.c:306: error: for each function it appears in.) libsmb/clikrb5.c:306: error: parse error before 'hnd' libsmb/clikrb5.c:307: error: 'krb5_krbhst_info' undeclared (first use in this function) libsmb/clikrb5.c:307: error: 'hinfo' undeclared (first use in this function) libsmb/clikrb5.c:316: error: 'KRB5_KRBHST_KDC' undeclared (first use in this function) libsmb/clikrb5.c:316: error: 'hnd' undeclared (first use in this function) libsmb/clikrb5.c:837:2: error: #error UNKNOWN_KRB5_AP_REQ_FREE_FUNCTION libsmb/clikrb5.c:879:2: error: #error UNKOWN_KRB5_AP_REQ_DECODING_FUNCTION make: *** [libsmb/clikrb5.o] Error 1 Latest update to my system was installation of gpg. Thoughts? -- Bruce Hobbs, CCP, CDP Engineered Software Office: 626-570-8028 Partner856 N Monterey StCell:626-278-0273 Alhambra, CA 91801-1574 FAX: 208-474-0732 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
RE: [Samba] Cifs client
I setup the mounts from the command line. I've done this for years with smbfs, and although there is always an issue when you try to access a mount to a windows machine that has gone stale, doesn't exist, etc, I've never had sessions lock up so severely that I had to physically power down the linux server as I have with cifs. Other than this issue, cifs works great and has many improvements over smbfs. Max How do you have the share setup on the Linux side? I had a problem when I did the mount via SMBFS in my /etc/fstab. When I switched to CIFS instead it seemed to fix it. I don't have samba running on the server, the two are not maintained in parallel. I think the samba team has just been gracious enough to work on/maintain the CIFS after SMBFS wasn't being further developed. I am using FC3 on my linux side and Win2k3 AS on the windows side. James -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] On Behalf Of Max Kipness Sent: Friday, December 30, 2005 11:13 AM To: samba@lists.samba.org Subject: [Samba] Cifs client I've been using the latest cifs 1.8 client at http://linux-cifs.samba.org/ with Fedora 3 and RHE 4. This client seems to have a lot of issues that I did not notice when using smbfs. It seems like when there is an issue with connectivity to a windows machine, and you try to access a cifs mount, the entire session locks up. I basically have to kill the session, log back on, and then there is no way to kill the process as it is showing a 'D' for 'waiting for I/O. There have been times on various linux servers where I had so many unkillable cifs processes that I then could not even do a reboot or shutdown of the system. I have had to physically hold the power down to halt the computer. My question is whether this in any way relates to Samba itself on the system. I see various revisions of the whole Samba suite, but I believe these revisions only handle improvements on the server-end. Anybody else using cifs for connectivity that has had these issues? Are there any ways around this or it is the product just unstable at this point? Thanks, Max -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] 3.0.21a make fails on Mac OS X 10.4.3
On Sat, Dec 31, 2005 at 07:33:11AM -0800, Bruce Hobbs wrote: Currently running 3.0.10 that comes standard with Mac OS X 10.4 (Tiger). Attempted to install 3.0.21a last night and make failed like this: Compiling libsmb/clikrb5.c libsmb/clikrb5.c: In function 'krb5_locate_kdc': libsmb/clikrb5.c:306: error: 'krb5_krbhst_handle' undeclared (first use in this function) libsmb/clikrb5.c:306: error: (Each undeclared identifier is reported only once libsmb/clikrb5.c:306: error: for each function it appears in.) libsmb/clikrb5.c:306: error: parse error before 'hnd' libsmb/clikrb5.c:307: error: 'krb5_krbhst_info' undeclared (first use in this function) libsmb/clikrb5.c:307: error: 'hinfo' undeclared (first use in this function) libsmb/clikrb5.c:316: error: 'KRB5_KRBHST_KDC' undeclared (first use in this function) libsmb/clikrb5.c:316: error: 'hnd' undeclared (first use in this function) libsmb/clikrb5.c:837:2: error: #error UNKNOWN_KRB5_AP_REQ_FREE_FUNCTION libsmb/clikrb5.c:879:2: error: #error UNKOWN_KRB5_AP_REQ_DECODING_FUNCTION make: *** [libsmb/clikrb5.o] Error 1 Latest update to my system was installation of gpg. Thoughts? Sorry, Apple don't provide any MacOS/X hardware or software to the Team so it's hard to make sure that the code works without easy access to vendor hardware. Someone is in the process of remedying that (one of Apples own customers, who need Samba to work on MacOS/X - if that doesn't embarrass Apple then nothing will :-) but we're waiting for the hardware to turn up in the New Year. Jeremy. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] 3.0.21a make fails on Mac OS X 10.4.3
On Sat, 2005-12-31 at 10:25 -0800, Jeremy Allison wrote: On Sat, Dec 31, 2005 at 07:33:11AM -0800, Bruce Hobbs wrote: Currently running 3.0.10 that comes standard with Mac OS X 10.4 (Tiger). Attempted to install 3.0.21a last night and make failed like this: Compiling libsmb/clikrb5.c libsmb/clikrb5.c: In function 'krb5_locate_kdc': libsmb/clikrb5.c:306: error: 'krb5_krbhst_handle' undeclared (first use in this function) libsmb/clikrb5.c:306: error: (Each undeclared identifier is reported only once libsmb/clikrb5.c:306: error: for each function it appears in.) libsmb/clikrb5.c:306: error: parse error before 'hnd' libsmb/clikrb5.c:307: error: 'krb5_krbhst_info' undeclared (first use in this function) libsmb/clikrb5.c:307: error: 'hinfo' undeclared (first use in this function) libsmb/clikrb5.c:316: error: 'KRB5_KRBHST_KDC' undeclared (first use in this function) libsmb/clikrb5.c:316: error: 'hnd' undeclared (first use in this function) libsmb/clikrb5.c:837:2: error: #error UNKNOWN_KRB5_AP_REQ_FREE_FUNCTION libsmb/clikrb5.c:879:2: error: #error UNKOWN_KRB5_AP_REQ_DECODING_FUNCTION make: *** [libsmb/clikrb5.o] Error 1 Latest update to my system was installation of gpg. Thoughts? Sorry, Apple don't provide any MacOS/X hardware or software to the Team so it's hard to make sure that the code works without easy access to vendor hardware. Someone is in the process of remedying that (one of Apples own customers, who need Samba to work on MacOS/X - if that doesn't embarrass Apple then nothing will :-) but we're waiting for the hardware to turn up in the New Year. For the record, while I was in at Apple I did actually see the machine that we have been promised public access too (and on which the build farm instance is intended to run). However, at the moment it remains in Seffond's cube :-) We talked about the krb5 patches, which where posted to the samba-technical list. My view is that we should remove krb5_locate_kdc() from Samba3, as it is only used by a debugging command in 'net', and has never been officially exported. Unfortunately the patches (which were a bundle) were never accepted, due mostly to your concerns regarding the prototypes for Apple's xattr calls. (They provide a seek offset). Andrew Bartlett -- Andrew Bartletthttp://samba.org/~abartlet/ Authentication Developer, Samba Team http://samba.org Student Network Administrator, Hawker College http://hawkerc.net signature.asc Description: This is a digitally signed message part -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Repeating .. directory listing on NT4 client from Fedora FC4 samba stock install
Upgraded with a fresh install from FC2 to Fedora FC4 from cdroms. The samba is samba-3.0.14a. The /home/public samba share under FC2 worked fine. The FC4 /home/public directory will repeatedly list .. in the directory listing for NT4 clients. This does not happen on W2K or XP. The directory looks like this .. testfile.txt DIR1\ \.. \testfile2.txt \testfile3.txt \DIR2\ \.. (if selected repeats whole root shared directory down) The .. repeats. If it is selected it repeats the whole root directory down. I have changed various hide Yes/No and even tried veto /../ but can not remove this behavior. I know FC2 (samba 3.0.5) did not have this problem. Is there a setting I can change that disables this. I have searched and could not come up with a decent description of the problem. In the mean time I have loaded another FC4 and upgraded samba to 3.0.21a and this problem does not appear on the upgraded samba. Any suggestions would be helpful. Tim - Yahoo! Shopping Find Great Deals on Holiday Gifts at Yahoo! Shopping -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Access Denied Error On Windows XP -- Linux Printer
I'm running Samba Version 3.0.14a on Debian Linux. My sm.conf is listed at the end of this message. I have two printers on server.thresh.lan, a Brother HL-1440 laser printer and an HP-5510 Office Jet (printer/scanner/fax/copier/gopher and dishwasher). The Brother is named laser and the HP is named multiuse. I have a multi-boot system on the LAN that can boot Windows 98, Windows 2000, and Windows XP. Right now I'm working with Windows XP. I had no problem installing the Brother printer on Windows XP. There was no problem with the printer being a network printer. I have tried to install the HP printer. I couldn't find the original driver disk, so I downloaded the drivers from HP. Part way through the install, the HP program tells me to connect the USB cable to the computer. Of course I can't do that, since the printer is connected to my server. I tried installing from the Add Printers program in the Printers window, and searched to see if there were a .inf file in the unpacked files from the HP install, but could not find one that described my printer (as Windows puts it). I finally installed it with the HP Office Jet driver listed by Windows as one of the pre-installed drivers. It installed, but there is no apparent connection. When I right click on the icon for this printer and select Open, I get the printer queue listing window with the message Access denied, unable to connect in the titlebar. There are no error messages or any corresponding messages in my Samba logs. After searching, I found one thing I tried. I opened the command prompt and typed in echo Hello //server/multiuse and it printed on the HP printer. This leads me to believe the problem is in the Windows drivers, since it is clear the systems connect and another shared printer is accessible. It's also clear Samba is listening and receiving messages sent to this printer. The HP Office Jet driver was the closest driver in Windows that I could see to try to match to the Office Jet 5510. I could not get any driver package from HP to work because they don't want to work with the printer on another system. If anyone knows what I can do to get this printer working, please let me know. I need it for testing a project I'm working on for a client. My guess is I need a driver that doesn't mind if it's on the network, but I'm open to whatever is practical and makes this printer work. Thanks! Hal ---smb.conf--- [global] workgroup = THRESH.LAN netbios name = SERVER server string = Samba Server %v encrypt passwords = Yes log file = /var/log/samba/log.%m max log size = 1000 # socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 printcap name = cups wins support = Yes printer admin = root hal create mask = 0777 directory mask = 0777 printing = cups [printers] comment = All Printers path = /var/spool/samba printer admin = hal root create mask = 0700 guest ok = Yes printable = Yes print command = /usr/bin/lp -P %p -oraw -r %s browseable = No [WinStuff] comment = Storage and extra program space for Windows test systems path = /data/Data/WinStuff read only = No [Audio] path = /data/Data/Audio read only = Yes -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
svn commit: samba r12638 - in branches/SAMBA_4_0/source: build/smb_build lib/registry
Author: metze
Date: 2005-12-31 08:19:48 + (Sat, 31 Dec 2005)
New Revision: 12638
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=12638
Log:
fix the build on BSD systems
metze
Modified:
branches/SAMBA_4_0/source/build/smb_build/config_mk.pm
branches/SAMBA_4_0/source/lib/registry/config.mk
Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/config_mk.pm
===
--- branches/SAMBA_4_0/source/build/smb_build/config_mk.pm 2005-12-31
05:34:29 UTC (rev 12637)
+++ branches/SAMBA_4_0/source/build/smb_build/config_mk.pm 2005-12-31
08:19:48 UTC (rev 12638)
@@ -29,8 +29,8 @@
MANPAGE = string,
- PUBLIC_PROTO_HEADER = string,
- PRIVATE_PROTO_HEADER = string
+ PUBLIC_PROTO_HEADER = string,
+ PRIVATE_PROTO_HEADER = string
},
MODULE = {
SUBSYSTEM = string,
@@ -44,7 +44,7 @@
NOPROTO = bool,
MANPAGE = string,
- PRIVATE_PROTO_HEADER = string
+ PRIVATE_PROTO_HEADER = string
},
BINARY = {
OBJ_FILES = list,
@@ -56,7 +56,7 @@
MANPAGE = string,
INSTALLDIR= string,
- PRIVATE_PROTO_HEADER = string
+ PRIVATE_PROTO_HEADER = string
},
LIBRARY = {
MAJOR_VERSION = string,
@@ -65,7 +65,7 @@
OBJ_FILES = list,
- DESCRIPTION = string,
+ DESCRIPTION = string,
REQUIRED_SUBSYSTEMS = list,
@@ -74,10 +74,10 @@
MANPAGE = string,
- PUBLIC_HEADERS = list,
+ PUBLIC_HEADERS= list,
- PUBLIC_PROTO_HEADER = string,
- PRIVATE_PROTO_HEADER = string
+ PUBLIC_PROTO_HEADER = string,
+ PRIVATE_PROTO_HEADER = string
}
};
@@ -174,7 +174,7 @@
$input-{$name}{NAME} = $name;
$input-{$name}{TYPE} = $type;
- $input-{$name}{BASEDIR} = $srcdir./.dirname($filename);
+ $input-{$name}{BASEDIR} = dirname($filename);
foreach my $key (values %{$result-{$section}}) {
$key-{VAL} = smb_build::input::strtrim($key-{VAL});
Modified: branches/SAMBA_4_0/source/lib/registry/config.mk
===
--- branches/SAMBA_4_0/source/lib/registry/config.mk2005-12-31 05:34:29 UTC
(rev 12637)
+++ branches/SAMBA_4_0/source/lib/registry/config.mk2005-12-31 08:19:48 UTC
(rev 12638)
@@ -16,9 +16,11 @@
NOPROTO = YES
OBJ_FILES = tdr_regf.o
-$(srcdir)/lib/registry/reg_backend_nt4.c: $(builddir)/lib/registry/tdr_regf.c
-$(builddir)/lib/registry/tdr_regf.c: $(srcdir)/lib/registry/regf.idl
- @CPP=$(CPP) $(PERL) pidl/pidl $(PIDL_ARGS) --header
--outputdir=$(builddir)/lib/registry --tdr-parser --
$(srcdir)/lib/registry/regf.idl
+lib/registry/reg_backend_nt4.c: lib/registry/tdr_regf.c
+lib/registry/tdr_regf.c: lib/registry/regf.idl
+ @CPP=$(CPP) $(PERL) pidl/pidl $(PIDL_ARGS) \
+ --header --outputdir=lib/registry \
+ --tdr-parser -- lib/registry/regf.idl
# Start MODULE registry_w95
svn commit: samba r12639 - in branches/SAMBA_4_0/source/torture/nbt: .
Author: metze
Date: 2005-12-31 08:42:01 + (Sat, 31 Dec 2005)
New Revision: 12639
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=12639
Log:
- do some tests with 0x20 0x1B names
- do some tests with 0xBF and 0xBE, this shows that the '+' padding
should be done by the client
metze
Modified:
branches/SAMBA_4_0/source/torture/nbt/wins.c
Changeset:
Modified: branches/SAMBA_4_0/source/torture/nbt/wins.c
===
--- branches/SAMBA_4_0/source/torture/nbt/wins.c2005-12-31 08:19:48 UTC
(rev 12638)
+++ branches/SAMBA_4_0/source/torture/nbt/wins.c2005-12-31 08:42:01 UTC
(rev 12639)
@@ -25,8 +25,8 @@
#define CHECK_VALUE(v, correct) do { \
if ((v) != (correct)) { \
- printf((%s) Incorrect value %s=%d - should be %d\n, \
- __location__, #v, v, correct); \
+ printf((%s) Incorrect value %s=%d (0x%X) - should be %d
(0x%X)\n, \
+ __location__, #v, v, v, correct, correct); \
ret = False; \
}} while (0)
@@ -40,7 +40,7 @@
#define CHECK_NAME(_name, correct) do { \
CHECK_STRING((_name).name, (correct).name); \
- CHECK_VALUE((_name).type, (correct).type); \
+ CHECK_VALUE((uint8_t)(_name).type, (uint8_t)(correct).type); \
CHECK_STRING((_name).scope, (correct).scope); \
} while (0)
@@ -293,7 +293,7 @@
uint32_t r = (uint32_t)(random() % (10));
name.name = talloc_asprintf(mem_ctx, _TORTURE-%5u, r);
-
+
name.type = NBT_NAME_CLIENT;
name.scope = NULL;
ret = nbt_test_wins_name(mem_ctx, address, name, NBT_NODE_H);
@@ -303,12 +303,24 @@
ret = nbt_test_wins_name(mem_ctx, address, name, NBT_NODE_H |
NBT_NM_GROUP);
+ name.type = NBT_NAME_SERVER;
+ ret = nbt_test_wins_name(mem_ctx, address, name, NBT_NODE_H);
+
name.type = NBT_NAME_LOGON;
ret = nbt_test_wins_name(mem_ctx, address, name, NBT_NODE_H |
NBT_NM_GROUP);
name.type = NBT_NAME_BROWSER;
ret = nbt_test_wins_name(mem_ctx, address, name, NBT_NODE_H |
NBT_NM_GROUP);
+ name.type = NBT_NAME_PDC;
+ ret = nbt_test_wins_name(mem_ctx, address, name, NBT_NODE_H);
+
+ name.type = 0xBF;
+ ret = nbt_test_wins_name(mem_ctx, address, name, NBT_NODE_H);
+
+ name.type = 0xBE;
+ ret = nbt_test_wins_name(mem_ctx, address, name, NBT_NODE_H);
+
name.scope = example;
name.type = 0x72;
ret = nbt_test_wins_name(mem_ctx, address, name, NBT_NODE_H);
svn commit: samba r12640 - in branches/SAMBA_4_0/source/librpc/rpc: .
Author: metze Date: 2005-12-31 08:44:33 + (Sat, 31 Dec 2005) New Revision: 12640 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=12640 Log: ignore generated dcerpc_table.h metze Modified: branches/SAMBA_4_0/source/librpc/rpc/ Changeset: Property changes on: branches/SAMBA_4_0/source/librpc/rpc ___ Name: svn:ignore - dcerpc_proto.h .sconsign *.po *.d + dcerpc_proto.h dcerpc_table.h .sconsign *.po *.d
svn commit: samba r12641 - in branches/SAMBA_4_0/source: lib torture/nbench
Author: metze
Date: 2005-12-31 09:08:46 + (Sat, 31 Dec 2005)
New Revision: 12641
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=12641
Log:
- remove some unused functions
- we already call usleep() directly in some places,
so do it everywhere
metze
Modified:
branches/SAMBA_4_0/source/lib/system.c
branches/SAMBA_4_0/source/torture/nbench/nbio.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/system.c
===
--- branches/SAMBA_4_0/source/lib/system.c 2005-12-31 08:44:33 UTC (rev
12640)
+++ branches/SAMBA_4_0/source/lib/system.c 2005-12-31 09:08:46 UTC (rev
12641)
@@ -38,73 +38,6 @@
expansions/etc make sense to the OS should be acceptable to Samba.
*/
-
-
-/***
- A wrapper for usleep in case we don't have one.
-/
-
-int sys_usleep(long usecs)
-{
-#ifndef HAVE_USLEEP
- struct timeval tval;
-#endif
-
- /*
-* We need this braindamage as the glibc usleep
-* is not SPEC1170 complient... grumble... JRA.
-*/
-
- if(usecs 0 || usecs 100) {
- errno = EINVAL;
- return -1;
- }
-
-#if HAVE_USLEEP
- usleep(usecs);
- return 0;
-#else /* HAVE_USLEEP */
- /*
-* Fake it with select...
-*/
- tval.tv_sec = 0;
- tval.tv_usec = usecs/1000;
- select(0,NULL,NULL,NULL,tval);
- return 0;
-#endif /* HAVE_USLEEP */
-}
-
-
-/***
-A read wrapper that will deal with EINTR.
-/
-
-ssize_t sys_read(int fd, void *buf, size_t count)
-{
- ssize_t ret;
-
- do {
- ret = read(fd, buf, count);
- } while (ret == -1 errno == EINTR);
- return ret;
-}
-
-/***
-A write wrapper that will deal with EINTR.
-/
-
-ssize_t sys_write(int fd, const void *buf, size_t count)
-{
- ssize_t ret;
-
- do {
- ret = write(fd, buf, count);
- } while (ret == -1 errno == EINTR);
- return ret;
-}
-
-
-
/**
A wrapper for gethostbyname() that tries avoids looking up hostnames
in the root domain, which can cause dial-on-demand links to come up for no
Modified: branches/SAMBA_4_0/source/torture/nbench/nbio.c
===
--- branches/SAMBA_4_0/source/torture/nbench/nbio.c 2005-12-31 08:44:33 UTC
(rev 12640)
+++ branches/SAMBA_4_0/source/torture/nbench/nbio.c 2005-12-31 09:08:46 UTC
(rev 12641)
@@ -649,8 +649,7 @@
void nb_sleep(int usec, NTSTATUS status)
{
- (void)status;
- sys_usleep(usec);
+ usleep(usec);
}
void nb_deltree(const char *dname)
svn commit: samba r12642 - in branches/SAMBA_4_0/source/wrepl_server: .
Author: metze
Date: 2005-12-31 09:44:04 + (Sat, 31 Dec 2005)
New Revision: 12642
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=12642
Log:
only do push notifications when something changed
metze
Modified:
branches/SAMBA_4_0/source/wrepl_server/wrepl_out_push.c
branches/SAMBA_4_0/source/wrepl_server/wrepl_server.c
branches/SAMBA_4_0/source/wrepl_server/wrepl_server.h
Changeset:
Modified: branches/SAMBA_4_0/source/wrepl_server/wrepl_out_push.c
===
--- branches/SAMBA_4_0/source/wrepl_server/wrepl_out_push.c 2005-12-31
09:08:46 UTC (rev 12641)
+++ branches/SAMBA_4_0/source/wrepl_server/wrepl_out_push.c 2005-12-31
09:44:04 UTC (rev 12642)
@@ -96,17 +96,35 @@
return;
}
-static uint32_t wreplsrv_calc_change_count(struct wreplsrv_partner *partner)
+static uint32_t wreplsrv_calc_change_count(struct wreplsrv_partner *partner,
uint64_t seqnumber)
{
- /* TODO: add a real implementation here */
- return (uint32_t)-1;
+ uint64_t tmp_diff = UINT32_MAX;
+
+ /* catch an overflow */
+ if (partner-push.seqnumber seqnumber) {
+ goto done;
+ }
+
+ tmp_diff = seqnumber - partner-push.seqnumber;
+
+ if (tmp_diff UINT32_MAX) {
+ tmp_diff = UINT32_MAX;
+ goto done;
+ }
+
+done:
+ partner-push.seqnumber = seqnumber;
+ return (uint32_t)(tmp_diff UINT32_MAX);
}
NTSTATUS wreplsrv_out_push_run(struct wreplsrv_service *service)
{
struct wreplsrv_partner *partner;
+ uint64_t seqnumber;
uint32_t change_count;
+ seqnumber = wreplsrv_local_db_seqnumber(service);
+
for (partner = service-partners; partner; partner = partner-next) {
/* if it's not a push partner, go to the next partner */
if (!(partner-type WINSREPL_PARTNER_PUSH)) continue;
@@ -115,7 +133,7 @@
if (partner-push.change_count == 0) continue;
/* get the actual change count for the partner */
- change_count = wreplsrv_calc_change_count(partner);
+ change_count = wreplsrv_calc_change_count(partner, seqnumber);
/* if the configured change count isn't reached, go to the next
partner */
if (change_count partner-push.change_count) continue;
Modified: branches/SAMBA_4_0/source/wrepl_server/wrepl_server.c
===
--- branches/SAMBA_4_0/source/wrepl_server/wrepl_server.c 2005-12-31
09:08:46 UTC (rev 12641)
+++ branches/SAMBA_4_0/source/wrepl_server/wrepl_server.c 2005-12-31
09:44:04 UTC (rev 12642)
@@ -197,6 +197,34 @@
return maxVersion;
}
+uint64_t wreplsrv_local_db_seqnumber(struct wreplsrv_service *service)
+{
+ int ret;
+ struct ldb_context *ldb = service-wins_db-ldb;
+ struct ldb_dn *dn;
+ struct ldb_result *res = NULL;
+ TALLOC_CTX *tmp_ctx = talloc_new(service);
+ uint64_t seqnumber = 0;
+
+ dn = ldb_dn_explode(tmp_ctx, @BASEINFO);
+ if (!dn) goto failed;
+
+ /* find the record in the WINS database */
+ ret = ldb_search(ldb, dn, LDB_SCOPE_BASE,
+NULL, NULL, res);
+ if (ret != LDB_SUCCESS) goto failed;
+ talloc_steal(tmp_ctx, res);
+ if (res-count 1) goto failed;
+
+ if (res-count == 1) {
+ seqnumber = ldb_msg_find_uint64(res-msgs[0], sequenceNumber,
0);
+ }
+
+failed:
+ talloc_free(tmp_ctx);
+ return seqnumber;
+}
+
NTSTATUS wreplsrv_fill_wrepl_table(struct wreplsrv_service *service,
TALLOC_CTX *mem_ctx,
struct wrepl_table *table_out,
Modified: branches/SAMBA_4_0/source/wrepl_server/wrepl_server.h
===
--- branches/SAMBA_4_0/source/wrepl_server/wrepl_server.h 2005-12-31
09:08:46 UTC (rev 12641)
+++ branches/SAMBA_4_0/source/wrepl_server/wrepl_server.h 2005-12-31
09:44:04 UTC (rev 12642)
@@ -172,6 +172,9 @@
/* change count till push notification */
uint32_t change_count;
+ /* the last wins db seqnumber we know about */
+ uint64_t seqnumber;
+
/* we should use WREPL_REPL_INFORM* messages to this partner */
BOOL use_inform;
svn commit: samba r12643 - in branches/SAMBA_4_0/source/lib/ldb: .
Author: idra Date: 2005-12-31 10:04:11 + (Sat, 31 Dec 2005) New Revision: 12643 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=12643 Log: don't fail make test thanks Brad Modified: branches/SAMBA_4_0/source/lib/ldb/Makefile.in Changeset: Modified: branches/SAMBA_4_0/source/lib/ldb/Makefile.in === --- branches/SAMBA_4_0/source/lib/ldb/Makefile.in 2005-12-31 09:44:04 UTC (rev 12642) +++ branches/SAMBA_4_0/source/lib/ldb/Makefile.in 2005-12-31 10:04:11 UTC (rev 12643) @@ -162,6 +162,9 @@ test-schema: @echo STARTING SCHEMA MODULE TEST tests/test-schema.sh +else +test-schema: + @echo SKIPPING SCHEMA MODULE TEST endif test: $(BINS) test-tdb test-ldap test-sqlite3 test-schema
svn commit: samba r12644 - in branches/SAMBA_4_0/source: nbt_server nbt_server/wins param
Author: metze
Date: 2005-12-31 10:41:59 + (Sat, 31 Dec 2005)
New Revision: 12644
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=12644
Log:
prepare the dns proxy feature for the wins server
metze
Added:
branches/SAMBA_4_0/source/nbt_server/wins/wins_dns_proxy.c
Modified:
branches/SAMBA_4_0/source/nbt_server/config.mk
branches/SAMBA_4_0/source/nbt_server/wins/winsserver.c
branches/SAMBA_4_0/source/param/loadparm.c
Changeset:
Modified: branches/SAMBA_4_0/source/nbt_server/config.mk
===
--- branches/SAMBA_4_0/source/nbt_server/config.mk 2005-12-31 10:04:11 UTC
(rev 12643)
+++ branches/SAMBA_4_0/source/nbt_server/config.mk 2005-12-31 10:41:59 UTC
(rev 12644)
@@ -17,7 +17,8 @@
OBJ_FILES = \
wins/winsserver.o \
wins/winsclient.o \
- wins/winswack.o
+ wins/winswack.o \
+ wins/wins_dns_proxy.o
PRIVATE_PROTO_HEADER = wins/winsserver_proto.h
REQUIRED_SUBSYSTEMS = \
LIBCLI_NBT WINSDB
Added: branches/SAMBA_4_0/source/nbt_server/wins/wins_dns_proxy.c
===
--- branches/SAMBA_4_0/source/nbt_server/wins/wins_dns_proxy.c 2005-12-31
10:04:11 UTC (rev 12643)
+++ branches/SAMBA_4_0/source/nbt_server/wins/wins_dns_proxy.c 2005-12-31
10:41:59 UTC (rev 12644)
@@ -0,0 +1,40 @@
+/*
+ Unix SMB/CIFS implementation.
+
+ wins server dns proxy
+
+ Copyright (C) Stefan Metzmacher 2005
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include includes.h
+#include nbt_server/nbt_server.h
+#include nbt_server/wins/winsdb.h
+#include nbt_server/wins/winsserver.h
+#include system/time.h
+#include libcli/composite/composite.h
+#include smbd/service_task.h
+
+/*
+ dns proxy query a name
+*/
+void nbtd_wins_dns_proxy_query(struct nbt_name_socket *nbtsock,
+ struct nbt_name_packet *packet,
+ const struct nbt_peer_socket *src)
+{
+ /* TODO: add a real implementation here */
+ nbtd_negative_name_query_reply(nbtsock, packet, src);
+}
Modified: branches/SAMBA_4_0/source/nbt_server/wins/winsserver.c
===
--- branches/SAMBA_4_0/source/nbt_server/wins/winsserver.c 2005-12-31
10:04:11 UTC (rev 12643)
+++ branches/SAMBA_4_0/source/nbt_server/wins/winsserver.c 2005-12-31
10:41:59 UTC (rev 12644)
@@ -583,7 +583,16 @@
status = winsdb_lookup(winssrv-wins_db, name, packet, rec);
if (!NT_STATUS_IS_OK(status)) {
- goto notfound;
+ if (!lp_wins_dns_proxy()) {
+ goto notfound;
+ }
+
+ if (name-type != NBT_NAME_CLIENT name-type !=
NBT_NAME_SERVER) {
+ goto notfound;
+ }
+
+ nbtd_wins_dns_proxy_query(nbtsock, packet, src);
+ return;
}
/*
Modified: branches/SAMBA_4_0/source/param/loadparm.c
===
--- branches/SAMBA_4_0/source/param/loadparm.c 2005-12-31 10:04:11 UTC (rev
12643)
+++ branches/SAMBA_4_0/source/param/loadparm.c 2005-12-31 10:41:59 UTC (rev
12644)
@@ -164,6 +164,7 @@
int web_port;
char *socket_options;
BOOL bWINSsupport;
+ BOOL bWINSdnsProxy;
BOOL bLocalMaster;
BOOL bPreferredMaster;
BOOL bEncryptPasswords;
@@ -519,6 +520,7 @@
{wins server, P_LIST, P_GLOBAL, Globals.szWINSservers, NULL, NULL,
FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
{wins support, P_BOOL, P_GLOBAL, Globals.bWINSsupport, NULL, NULL,
FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
+ {dns proxy, P_BOOL, P_GLOBAL, Globals.bWINSdnsProxy, NULL, NULL,
FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
{Locking Options, P_SEP, P_SEPARATOR},
@@ -672,7 +674,8 @@
do_parameter(PreferredMaster, Auto, NULL);
do_parameter(LocalMaster, True, NULL);
- do_parameter(WINSsupport, False, NULL);
+ do_parameter(wins support, False, NULL);
+ do_parameter(dns proxy, False, NULL);
svn commit: samba r12645 - in branches/SAMBA_3_0/source/passdb: .
Author: vlendec
Date: 2005-12-31 10:57:43 + (Sat, 31 Dec 2005)
New Revision: 12645
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=12645
Log:
Fix some memleaks. This will also be in the trunk checkin that comes next.
Volker
Modified:
branches/SAMBA_3_0/source/passdb/pdb_ldap.c
Changeset:
Modified: branches/SAMBA_3_0/source/passdb/pdb_ldap.c
===
--- branches/SAMBA_3_0/source/passdb/pdb_ldap.c 2005-12-31 10:41:59 UTC (rev
12644)
+++ branches/SAMBA_3_0/source/passdb/pdb_ldap.c 2005-12-31 10:57:43 UTC (rev
12645)
@@ -4070,6 +4070,9 @@
vals = ldap_get_values(ld, entry, sambaGroupType);
if ((vals == NULL) || (vals[0] == NULL)) {
DEBUG(5, (\sambaGroupType\ not found\n));
+ if (vals != NULL) {
+ ldap_value_free(vals);
+ }
return False;
}
@@ -4077,9 +4080,12 @@
if ((state-group_type != 0)
((state-group_type != group_type))) {
+ ldap_value_free(vals);
return False;
}
+ ldap_value_free(vals);
+
/* display name is the NT group name */
vals = ldap_get_values(ld, entry, displayName);
@@ -4119,6 +4125,9 @@
vals = ldap_get_values(ld, entry, sambaSid);
if ((vals == NULL) || (vals[0] == NULL)) {
DEBUG(0, (\objectSid\ not found\n));
+ if (vals != NULL) {
+ ldap_value_free(vals);
+ }
return False;
}
svn commit: samba r12646 - in trunk/source: include lib passdb sam
Author: vlendec Date: 2005-12-31 11:11:17 + (Sat, 31 Dec 2005) New Revision: 12646 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=12646 Log: A couple of things: * The functional change in this patch is the handling of group mapping entries. We now can add aliases as stand-alone mapping entries, no idmap or posixgroup is necessary. If a domain group entry is about to be added, a posix group is mandatory. And updates can only change the description and displayname. It just does not make sense to *change* the type, gid or sid of a group mapping entry. Better explicitly remove it and start fresh with a new rid. * The bulk of the patch volume comes from changing get_attr_list to talloc and thus removing of the function free_attr_list. * All (did I forget any) LDAP operations now print the ldap error directly. This removes a bit of error message printing code in the upper layers. * Ah, and the memleak fix is also in. Volker Modified: trunk/source/include/smbldap.h trunk/source/lib/smbldap.c trunk/source/lib/smbldap_util.c trunk/source/passdb/pdb_ldap.c trunk/source/passdb/pdb_nds.c trunk/source/sam/idmap_ldap.c Changeset: Sorry, the patch is too large (1336 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=12646
svn commit: samba r12647 - in branches/SAMBA_4_0/source/nbt_server/wins: .
Author: metze
Date: 2005-12-31 11:19:18 + (Sat, 31 Dec 2005)
New Revision: 12647
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=12647
Log:
make use of the str_list_add function
metze
Modified:
branches/SAMBA_4_0/source/nbt_server/wins/winsserver.c
Changeset:
Modified: branches/SAMBA_4_0/source/nbt_server/wins/winsserver.c
===
--- branches/SAMBA_4_0/source/nbt_server/wins/winsserver.c 2005-12-31
11:11:17 UTC (rev 12646)
+++ branches/SAMBA_4_0/source/nbt_server/wins/winsserver.c 2005-12-31
11:19:18 UTC (rev 12647)
@@ -601,13 +601,11 @@
* the record is released or tombstoned
*/
if (rec-type == WREPL_TYPE_GROUP) {
- addresses = talloc_array(packet, const char *, 2);
- if (addresses == NULL) {
- nbtd_negative_name_query_reply(nbtsock, packet, src);
- return;
+ addresses = str_list_add(NULL, 255.255.255.255);
+ talloc_steal(packet, addresses);
+ if (!addresses) {
+ goto notfound;
}
- addresses[0] = 255.255.255.255;
- addresses[1] = NULL;
goto found;
}
svn commit: samba r12648 - in branches/SAMBA_4_0/source/nbt_server/wins: .
Author: metze
Date: 2005-12-31 11:32:55 + (Sat, 31 Dec 2005)
New Revision: 12648
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=12648
Log:
implement the dns proxy feature
metze
Modified:
branches/SAMBA_4_0/source/nbt_server/wins/wins_dns_proxy.c
Changeset:
Modified: branches/SAMBA_4_0/source/nbt_server/wins/wins_dns_proxy.c
===
--- branches/SAMBA_4_0/source/nbt_server/wins/wins_dns_proxy.c 2005-12-31
11:19:18 UTC (rev 12647)
+++ branches/SAMBA_4_0/source/nbt_server/wins/wins_dns_proxy.c 2005-12-31
11:32:55 UTC (rev 12648)
@@ -28,6 +28,38 @@
#include libcli/composite/composite.h
#include smbd/service_task.h
+struct wins_dns_proxy_state {
+ struct nbt_name_socket *nbtsock;
+ struct nbt_name_packet *packet;
+ struct nbt_peer_socket src;
+};
+
+static void nbtd_wins_dns_proxy_handler(struct composite_context *creq)
+{
+ NTSTATUS status;
+ struct wins_dns_proxy_state *s =
talloc_get_type(creq-async.private_data,
+struct
wins_dns_proxy_state);
+ struct nbt_name *name = s-packet-questions[0].name;
+ const char *address;
+ const char **addresses;
+ uint16_t nb_flags = 0; /* TODO: ... */
+
+ status = resolve_name_recv(creq, s-packet, address);
+ if (!NT_STATUS_IS_OK(status)) {
+ goto notfound;
+ }
+
+ addresses = str_list_add(NULL, address);
+ talloc_steal(s-packet, addresses);
+ if (!addresses) goto notfound;
+
+ nbtd_name_query_reply(s-nbtsock, s-packet, s-src, name,
+ 0, nb_flags, addresses);
+ return;
+notfound:
+ nbtd_negative_name_query_reply(s-nbtsock, s-packet, s-src);
+}
+
/*
dns proxy query a name
*/
@@ -35,6 +67,29 @@
struct nbt_name_packet *packet,
const struct nbt_peer_socket *src)
{
- /* TODO: add a real implementation here */
+ struct nbt_name *name = packet-questions[0].name;
+ struct nbtd_interface *iface =
talloc_get_type(nbtsock-incoming.private,
+ struct nbtd_interface);
+ struct wins_dns_proxy_state *s;
+ struct composite_context *creq;
+ const char *methods[] = {
+ host,
+ NULL
+ };
+
+ s = talloc(nbtsock, struct wins_dns_proxy_state);
+ if (!s) goto failed;
+ s-nbtsock = nbtsock;
+ s-packet = talloc_steal(s, packet);
+ s-src = *src;
+ talloc_steal(s, src-addr);
+
+ creq = resolve_name_send(name, iface-nbtsrv-task-event_ctx, methods);
+ if (!creq) goto failed;
+
+ creq-async.fn = nbtd_wins_dns_proxy_handler;
+ creq-async.private_data= s;
+ return;
+failed:
nbtd_negative_name_query_reply(nbtsock, packet, src);
}
svn commit: samba r12649 - in branches/SAMBA_4_0/source/param: .
Author: metze
Date: 2005-12-31 11:57:15 + (Sat, 31 Dec 2005)
New Revision: 12649
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=12649
Log:
use the same default('yes') for 'dns proxy' as samba3
metze
Modified:
branches/SAMBA_4_0/source/param/loadparm.c
Changeset:
Modified: branches/SAMBA_4_0/source/param/loadparm.c
===
--- branches/SAMBA_4_0/source/param/loadparm.c 2005-12-31 11:32:55 UTC (rev
12648)
+++ branches/SAMBA_4_0/source/param/loadparm.c 2005-12-31 11:57:15 UTC (rev
12649)
@@ -675,7 +675,7 @@
do_parameter(LocalMaster, True, NULL);
do_parameter(wins support, False, NULL);
- do_parameter(dns proxy, False, NULL);
+ do_parameter(dns proxy, True, NULL);
do_parameter(winbind separator, \\, NULL);
do_parameter(winbind sealed pipes, True, NULL);
svn commit: samba r12650 - in branches/SAMBA_4_0/source/librpc/ndr: .
Author: jelmer
Date: 2005-12-31 14:29:13 + (Sat, 31 Dec 2005)
New Revision: 12650
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=12650
Log:
Remove support for NULLTERM flag (is already covered by tridge's
fixes to [validate])
Modified:
branches/SAMBA_4_0/source/librpc/ndr/ndr_string.c
Changeset:
Modified: branches/SAMBA_4_0/source/librpc/ndr/ndr_string.c
===
--- branches/SAMBA_4_0/source/librpc/ndr/ndr_string.c 2005-12-31 11:57:15 UTC
(rev 12649)
+++ branches/SAMBA_4_0/source/librpc/ndr/ndr_string.c 2005-12-31 14:29:13 UTC
(rev 12650)
@@ -643,12 +643,6 @@
NDR_PULL_NEED_BYTES(ndr, length*byte_mul);
- if (ndr-flags LIBNDR_FLAG_STR_NULLTERM) {
- /* Explicitly ignore the return value here. An array that
-* is not zero-terminated is considered a warning only, not
fatal */
- ndr_check_string_terminator(ndr, length, byte_mul);
- }
-
ret = convert_string_talloc(ndr-current_mem_ctx,
chset, CH_UNIX,
ndr-data+ndr-offset,
svn commit: samba r12651 - in branches/SAMBA_4_0/source/librpc: idl ndr
Author: jelmer
Date: 2005-12-31 14:57:43 + (Sat, 31 Dec 2005)
New Revision: 12651
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=12651
Log:
Remove STR_LARGE_SIZE as it's no longer used
Modified:
branches/SAMBA_4_0/source/librpc/idl/idl_types.h
branches/SAMBA_4_0/source/librpc/ndr/libndr.h
branches/SAMBA_4_0/source/librpc/ndr/ndr_string.c
Changeset:
Modified: branches/SAMBA_4_0/source/librpc/idl/idl_types.h
===
--- branches/SAMBA_4_0/source/librpc/idl/idl_types.h2005-12-31 14:29:13 UTC
(rev 12650)
+++ branches/SAMBA_4_0/source/librpc/idl/idl_types.h2005-12-31 14:57:43 UTC
(rev 12651)
@@ -10,7 +10,6 @@
#define STR_CONFORMANT LIBNDR_FLAG_STR_CONFORMANT
#define STR_CHARLENLIBNDR_FLAG_STR_CHARLEN
#define STR_UTF8 LIBNDR_FLAG_STR_UTF8
-#define STR_LARGE_SIZE LIBNDR_FLAG_STR_LARGE_SIZE
/*
a UCS2 string prefixed with [size], 32 bits
Modified: branches/SAMBA_4_0/source/librpc/ndr/libndr.h
===
--- branches/SAMBA_4_0/source/librpc/ndr/libndr.h 2005-12-31 14:29:13 UTC
(rev 12650)
+++ branches/SAMBA_4_0/source/librpc/ndr/libndr.h 2005-12-31 14:57:43 UTC
(rev 12651)
@@ -115,7 +115,6 @@
#define LIBNDR_FLAG_STR_CHARLEN(111)
#define LIBNDR_FLAG_STR_UTF8 (112)
#define LIBNDR_FLAG_STR_FIXLEN15 (113)
-#define LIBNDR_FLAG_STR_LARGE_SIZE (114)
#define LIBNDR_STRING_FLAGS(0x7FFC)
Modified: branches/SAMBA_4_0/source/librpc/ndr/ndr_string.c
===
--- branches/SAMBA_4_0/source/librpc/ndr/ndr_string.c 2005-12-31 14:29:13 UTC
(rev 12650)
+++ branches/SAMBA_4_0/source/librpc/ndr/ndr_string.c 2005-12-31 14:57:43 UTC
(rev 12651)
@@ -65,7 +65,6 @@
switch (flags LIBNDR_STRING_FLAGS) {
case LIBNDR_FLAG_STR_LEN4|LIBNDR_FLAG_STR_SIZE4:
case LIBNDR_FLAG_STR_LEN4|LIBNDR_FLAG_STR_SIZE4|LIBNDR_FLAG_STR_NOTERM:
- case
LIBNDR_FLAG_STR_LEN4|LIBNDR_FLAG_STR_SIZE4|LIBNDR_FLAG_STR_NOTERM|LIBNDR_FLAG_STR_LARGE_SIZE:
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, len1));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, ofs));
if (ofs != 0) {
@@ -94,16 +93,8 @@
}
NDR_CHECK(ndr_pull_advance(ndr, (len2 + c_len_term)*byte_mul));
- if (ndr-flags LIBNDR_FLAG_STR_LARGE_SIZE) {
- if (len1 != 0 len2 == 0) {
- DEBUG(6,(len1[%u] != (len2[%u]) '%s'\n, len1,
len2, as));
- } else if (len1 != (len2 + 1)) {
- DEBUG(6,(len1[%u] != (len2[%u]+1) '%s'\n,
len1, len2, as));
- }
- } else {
- if (len1 != len2) {
- DEBUG(6,(len1[%u] != len2[%u] '%s'\n, len1,
len2, as));
- }
+ if (len1 != len2) {
+ DEBUG(6,(len1[%u] != len2[%u] '%s'\n, len1, len2,
as));
}
/* this is a way of detecting if a string is sent with the wrong
@@ -351,7 +342,6 @@
case LIBNDR_FLAG_STR_LEN4|LIBNDR_FLAG_STR_SIZE4|LIBNDR_FLAG_STR_NOTERM:
c_len_term = 0;
- case
LIBNDR_FLAG_STR_LEN4|LIBNDR_FLAG_STR_SIZE4|LIBNDR_FLAG_STR_NOTERM|LIBNDR_FLAG_STR_LARGE_SIZE:
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, c_len+c_len_term));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, c_len));
Build status as of Sun Jan 1 00:00:01 2006
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2005-12-31 00:00:05.0 + +++ /home/build/master/cache/broken_results.txt 2006-01-01 00:00:17.0 + @@ -1,17 +1,17 @@ -Build status as of Sat Dec 31 00:00:02 2005 +Build status as of Sun Jan 1 00:00:01 2006 Build counts: Tree Total Broken Panic ccache 6 2 0 -distcc 8 2 0 -lorikeet-heimdal 14 8 0 +distcc 9 2 0 +lorikeet-heimdal 25 13 0 ppp 15 0 0 -rsync26 1 0 +rsync27 2 0 samba1 0 0 samba-docs 0 0 0 -samba4 30 25 0 +samba4 30 15 2 samba_3_028 5 0 -smb-build21 2 0 -talloc 7 4 0 -tdb 7 2 0 +smb-build22 2 0 +talloc 26 8 0 +tdb 5 1 0
