svn commit: samba-docs r846 - in trunk/smbdotconf/winbind: .
Author: gd Date: 2005-10-21 10:00:35 + (Fri, 21 Oct 2005) New Revision: 846 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=846 Log: Document idmap_ad plugin and winbindd nss info. Guenther Added: trunk/smbdotconf/winbind/winbindnssinfo.xml Modified: trunk/smbdotconf/winbind/idmapbackend.xml Changeset: Modified: trunk/smbdotconf/winbind/idmapbackend.xml === --- trunk/smbdotconf/winbind/idmapbackend.xml 2005-10-20 21:16:38 UTC (rev 845) +++ trunk/smbdotconf/winbind/idmapbackend.xml 2005-10-21 10:00:35 UTC (rev 846) @@ -20,9 +20,18 @@ with multiple domain environments. The idmap uid and idmap gid ranges must also be specified. /para + + para + Finally, using the idmap_ad module, the UID and GID can directly + be retrieved from an Active Directory LDAP Server that supports an + RFC2307 compliant LDAP schema. idmap_ad supports Services for Unix + (SFU) version 2.x and 3.0. + /para + /description value type=default/value value type=exampleldap:ldap://ldapslave.example.com/value -value type=exampleidmap_rid:DOMNAME=1000-1/value +value type=exampleidmap_rid:BUILTIN=1000-1999,DOMNAME=2000-1/value +value type=exampleidmap_ad/value /samba:parameter Added: trunk/smbdotconf/winbind/winbindnssinfo.xml === --- trunk/smbdotconf/winbind/winbindnssinfo.xml 2005-10-20 21:16:38 UTC (rev 845) +++ trunk/smbdotconf/winbind/winbindnssinfo.xml 2005-10-21 10:00:35 UTC (rev 846) @@ -0,0 +1,38 @@ +samba:parameter name=winbind nss info + context=G +type=boolean + advanced=1 developer=1 + xmlns:samba=http://www.samba.org/samba/DTD/samba-doc; +description + + paraThis parameter is designed to control how Winbind retrieves Name + Service Information to construct a user's home directory and login shell. + Currently the following settings are available: + + itemizedlist + listitem + paraparameter moreinfo=nonetemplate/parameter + - The default, using the parameters of parameter moreinfo=nonetemplate + shell/parameter and parameter moreinfo=nonetemplate homedir/parameter) + /para + /listitem + + listitem + paraparameter moreinfo=nonesfu/parameter + - When Samba is running in security = ads and your Active Directory + Domain Controller does support the Microsoft Services for Unix (SFU) + LDAP schema, winbind can retrieve the login shell and the home + directory attributes directly from your Directory Server. Note that + retrieving UID and GID from your ADS-Server requires to use + parameter moreinfo=nonidmap backend/parameter = idmap_ad as well. + /para + /listitem + + /itemizedlist + +/para +/description + +value type=defaulttemplate/value +value type=exampletemplate sfu/value +/samba:parameter
svn commit: samba r11241 - in branches/SAMBA_4_0/source/kdc: .
Author: metze
Date: 2005-10-21 10:08:40 + (Fri, 21 Oct 2005)
New Revision: 11241
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=11241
Log:
- fix compiler warning
- fix comment
metze
Modified:
branches/SAMBA_4_0/source/kdc/kpasswdd.c
Changeset:
Modified: branches/SAMBA_4_0/source/kdc/kpasswdd.c
===
--- branches/SAMBA_4_0/source/kdc/kpasswdd.c2005-10-21 02:14:23 UTC (rev
11240)
+++ branches/SAMBA_4_0/source/kdc/kpasswdd.c2005-10-21 10:08:40 UTC (rev
11241)
@@ -224,7 +224,7 @@
switch (version) {
case KRB5_KPASSWD_VERS_CHANGEPW:
{
- char *password = talloc_strndup(mem_ctx, input-data,
input-length);
+ char *password = talloc_strndup(mem_ctx, (const char
*)input-data, input-length);
if (!password) {
return False;
}
@@ -308,7 +308,7 @@
status = samdb_set_password(samdb, mem_ctx,
set_password_on_dn, NULL,
msg, password, NULL, NULL,
- False, /* this is a user password
change */
+ False, /* this is not a user
password change */
True, /* run restriction tests */
reject_reason, dominfo);
svn commit: samba r11242 - branches/SAMBA_3_0/source/include branches/SAMBA_3_0/source/nsswitch trunk/source/include trunk/source/nsswitch
Author: gd Date: 2005-10-21 12:50:39 + (Fri, 21 Oct 2005) New Revision: 11242 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=11242 Log: use LDAP bitwise machting rule when searching for groups in ADS. This avoids that each time a full-group-dump is requested from ADS; the bitwise match allows to only query those groups we are interested in. The ADS LDAP server changed to RFC compliant behaviour when decoding the ldap filter with extensible match in the latest SPs (fixes). From the patch: /* Workaround ADS LDAP bug present in MS W2K3 SP0 and W2K SP4 w/o * rollup-fixes: * * According to Section 5.1(4) of RFC 2251 if a value of a type is it's * default value, it MUST be absent. In case of extensible matching the * dnattr boolean defaults to FALSE and so it must be only be present * when set to TRUE. * * When it is set to FALSE and the OpenLDAP lib (correctly) encodes a * filter using bitwise matching rule then a buggy AD fails to decode * the extensible match. As a workaround set it to TRUE and thereby add * the dnAttributes dn field to cope with those older AD versions. * It should not harm and won't put any additional load on the AD since * none of the dn components have a bitmask-attribute. * * Thanks to Ralf Haferkamp for input and testing */ Guenther Modified: branches/SAMBA_3_0/source/include/ads.h branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c trunk/source/include/ads.h trunk/source/nsswitch/winbindd_ads.c Changeset: Sorry, the patch is too large (295 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=11242
svn commit: samba r11243 - in branches/SAMBA_4_0/source: librpc/idl torture/rpc
Author: jelmer
Date: 2005-10-21 13:06:21 + (Fri, 21 Oct 2005)
New Revision: 11243
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=11243
Log:
length and size can now be filled in automatically.
Modified:
branches/SAMBA_4_0/source/librpc/idl/winreg.idl
branches/SAMBA_4_0/source/torture/rpc/winreg.c
Changeset:
Modified: branches/SAMBA_4_0/source/librpc/idl/winreg.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/winreg.idl 2005-10-21 12:50:39 UTC
(rev 11242)
+++ branches/SAMBA_4_0/source/librpc/idl/winreg.idl 2005-10-21 13:06:21 UTC
(rev 11243)
@@ -130,11 +130,8 @@
);
typedef struct {
- /* we can't use value(strlen_m(name)*2) here as it
- doesn't propogate to the length_is() property
- below. Jelmer, can this be fixed? */
- uint16 length;
- uint16 size;
+ [value(strlen_m(name)*2)] uint16 length;
+ [value(strlen_m(name)*2)] uint16 size;
[size_is(size/2),length_is(length/2),charset(UTF16)] uint16
*name;
} winreg_StringBuf;
Modified: branches/SAMBA_4_0/source/torture/rpc/winreg.c
===
--- branches/SAMBA_4_0/source/torture/rpc/winreg.c 2005-10-21 12:50:39 UTC
(rev 11242)
+++ branches/SAMBA_4_0/source/torture/rpc/winreg.c 2005-10-21 13:06:21 UTC
(rev 11243)
@@ -402,9 +402,7 @@
printf(Testing EnumKey\n\n);
- class.length = 0;
- class.size = 0;
- class.name = NULL;
+ class.name = ;
r.in.handle = handle;
r.in.enum_index = 0;
@@ -414,8 +412,6 @@
r.in.last_changed_time = t;
do {
- name.length = 0;
- name.size = 1024;
name.name = NULL;
status = dcerpc_winreg_EnumKey(p, mem_ctx, r);
@@ -536,8 +532,6 @@
printf(testing EnumValue\n);
- name.length = 0;
- name.size = 1024;
name.name = ;
r.in.handle = handle;
svn commit: samba r11247 - in branches/SAMBA_4_0/source/build/smb_build: .
Author: jelmer Date: 2005-10-21 19:24:13 + (Fri, 21 Oct 2005) New Revision: 11247 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=11247 Log: Add environment class Added: branches/SAMBA_4_0/source/build/smb_build/env.pm Modified: branches/SAMBA_4_0/source/build/smb_build/main.pl branches/SAMBA_4_0/source/build/smb_build/makefile.pm Changeset: Sorry, the patch is too large (378 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=11247
svn commit: samba r11248 - in branches/SAMBA_4_0/source/libcli/smb_composite: .
Author: vlendec Date: 2005-10-21 19:31:36 + (Fri, 21 Oct 2005) New Revision: 11248 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=11248 Log: Fix anon fallback with spnego Modified: branches/SAMBA_4_0/source/libcli/smb_composite/connect.c Changeset: Modified: branches/SAMBA_4_0/source/libcli/smb_composite/connect.c === --- branches/SAMBA_4_0/source/libcli/smb_composite/connect.c2005-10-21 19:24:13 UTC (rev 11247) +++ branches/SAMBA_4_0/source/libcli/smb_composite/connect.c2005-10-21 19:31:36 UTC (rev 11248) @@ -173,6 +173,11 @@ cli_credentials_set_conf(state-io_setup-in.credentials); cli_credentials_set_anonymous(state-io_setup-in.credentials); + /* If the preceding attempt was with extended security, we +* have been given a uid in the NTLMSSP_CHALLENGE reply. This +* would lead to an invalid uid in the anonymous fallback */ + state-session-vuid = 0; + state-creq = smb_composite_sesssetup_send(state-session, state-io_setup); NT_STATUS_HAVE_NO_MEMORY(state-creq);
svn commit: samba r11249 - in branches/SAMBA_4_0/source: build/smb_build lib/registry
Author: jelmer
Date: 2005-10-21 20:40:58 + (Fri, 21 Oct 2005)
New Revision: 11249
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=11249
Log:
More OpenBSD make fixes...
Modified:
branches/SAMBA_4_0/source/build/smb_build/makefile.pm
branches/SAMBA_4_0/source/build/smb_build/output.pm
branches/SAMBA_4_0/source/lib/registry/config.mk
Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2005-10-21
19:31:36 UTC (rev 11248)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2005-10-21
20:40:58 UTC (rev 11249)
@@ -182,7 +182,10 @@
my @mp_list = ();
foreach (values %$ctx) {
- push (@mp_list, $_-{BASEDIR}/$_-{MANPAGE}) if
(defined($_-{MANPAGE}) and $_-{MANPAGE} ne );
+ my $dir = $_-{BASEDIR};
+ next unless defined($dir);
+ $dir =~ s/^\.\///g;
+ push (@mp_list, $dir/$_-{MANPAGE}) if
(defined($_-{MANPAGE}) and $_-{MANPAGE} ne );
}
my $mp = array2oneperline([EMAIL PROTECTED]);
Modified: branches/SAMBA_4_0/source/build/smb_build/output.pm
===
--- branches/SAMBA_4_0/source/build/smb_build/output.pm 2005-10-21 19:31:36 UTC
(rev 11248)
+++ branches/SAMBA_4_0/source/build/smb_build/output.pm 2005-10-21 20:40:58 UTC
(rev 11249)
@@ -14,6 +14,8 @@
{
my ($dir,$files) = @_;
my @ret = ();
+
+ $dir =~ s/^\.\///g;
foreach (@$files) {
$_ = $dir/$_;
Modified: branches/SAMBA_4_0/source/lib/registry/config.mk
===
--- branches/SAMBA_4_0/source/lib/registry/config.mk2005-10-21 19:31:36 UTC
(rev 11248)
+++ branches/SAMBA_4_0/source/lib/registry/config.mk2005-10-21 20:40:58 UTC
(rev 11249)
@@ -16,8 +16,8 @@
NOPROTO = YES
INIT_OBJ_FILES = tdr_regf.o
-./lib/registry/reg_backend_nt4.c: ./lib/registry/tdr_regf.c
-./lib/registry/tdr_regf.c: 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) pidl/pidl $(PIDL_ARGS) --header --outputdir=lib/registry
--tdr-header --tdr-parser -- lib/registry/regf.idl
svn commit: samba r11251 - branches/SAMBA_3_0/source/nsswitch trunk/source/nsswitch
Author: vlendec Date: 2005-10-21 21:25:26 + (Fri, 21 Oct 2005) New Revision: 11251 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=11251 Log: Fix a comment Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_dual.c trunk/source/nsswitch/winbindd_dual.c Changeset: Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_dual.c === --- branches/SAMBA_3_0/source/nsswitch/winbindd_dual.c 2005-10-21 21:00:02 UTC (rev 11250) +++ branches/SAMBA_3_0/source/nsswitch/winbindd_dual.c 2005-10-21 21:25:26 UTC (rev 11251) @@ -1,7 +1,7 @@ /* Unix SMB/CIFS implementation. - Winbind background daemon + Winbind child daemons Copyright (C) Andrew Tridgell 2002 Copyright (C) Volker Lendecke 2004,2005 @@ -22,12 +22,10 @@ */ /* - the idea of the optional dual daemon mode is ot prevent slow domain - responses from clagging up the rest of the system. When in dual - daemon mode winbindd always responds to requests from cache if the - request is in cache, and if the cached answer is stale then it asks - the dual daemon to update the cache for that request - + * We fork a child per domain to be able to act non-blocking in the main + * winbind daemon. A domain controller thousands of miles away being being + * slow replying with a 10.000 user list should not hold up netlogon calls + * that can be handled locally. */ #include includes.h Modified: trunk/source/nsswitch/winbindd_dual.c === --- trunk/source/nsswitch/winbindd_dual.c 2005-10-21 21:00:02 UTC (rev 11250) +++ trunk/source/nsswitch/winbindd_dual.c 2005-10-21 21:25:26 UTC (rev 11251) @@ -1,7 +1,7 @@ /* Unix SMB/CIFS implementation. - Winbind background daemon + Winbind child daemons Copyright (C) Andrew Tridgell 2002 Copyright (C) Volker Lendecke 2004,2005 @@ -22,12 +22,10 @@ */ /* - the idea of the optional dual daemon mode is ot prevent slow domain - responses from clagging up the rest of the system. When in dual - daemon mode winbindd always responds to requests from cache if the - request is in cache, and if the cached answer is stale then it asks - the dual daemon to update the cache for that request - + * We fork a child per domain to be able to act non-blocking in the main + * winbind daemon. A domain controller thousands of miles away being being + * slow replying with a 10.000 user list should not hold up netlogon calls + * that can be handled locally. */ #include includes.h
svn commit: samba r11252 - in branches/SAMBA_4_0/source/build/smb_build: .
Author: jelmer Date: 2005-10-21 21:43:39 + (Fri, 21 Oct 2005) New Revision: 11252 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=11252 Log: Make makefile.pm OO and descend from env Modified: branches/SAMBA_4_0/source/build/smb_build/env.pm branches/SAMBA_4_0/source/build/smb_build/main.pl branches/SAMBA_4_0/source/build/smb_build/makefile.pm Changeset: Sorry, the patch is too large (442 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=11252
svn commit: samba r11256 - in branches/SAMBA_3_0/source: libsmb passdb
Author: jra
Date: 2005-10-21 22:48:27 + (Fri, 21 Oct 2005)
New Revision: 11256
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=11256
Log:
Remove use of long long and strtoll in libsmbclient (we
can't assume long long is always there). Removed unused
var in new a/c rename code.
long long still used in eventlog code but Jerry has promised
to fix that.
Jeremy.
Modified:
branches/SAMBA_3_0/source/libsmb/libsmbclient.c
branches/SAMBA_3_0/source/passdb/pdb_smbpasswd.c
Changeset:
Modified: branches/SAMBA_3_0/source/libsmb/libsmbclient.c
===
--- branches/SAMBA_3_0/source/libsmb/libsmbclient.c 2005-10-21 22:48:15 UTC
(rev 11255)
+++ branches/SAMBA_3_0/source/libsmb/libsmbclient.c 2005-10-21 22:48:27 UTC
(rev 11256)
@@ -30,14 +30,13 @@
/*
* DOS Attribute values (used internally)
*/
-typedef struct DOS_ATTR_DESC
-{
-int mode;
-unsigned long long size;
-time_t a_time;
-time_t c_time;
-time_t m_time;
-unsigned long long inode;
+typedef struct DOS_ATTR_DESC {
+ int mode;
+ SMB_OFF_T size;
+ time_t a_time;
+ time_t c_time;
+ time_t m_time;
+ SMB_INO_T inode;
} DOS_ATTR_DESC;
@@ -3738,36 +3737,36 @@
}
if (StrnCaseCmp(tok, SIZE:, 5) == 0) {
-dad-size = strtoll(tok+5, NULL, 10);
+dad-size = (SMB_OFF_T)atof(tok+5);
continue;
}
if (StrnCaseCmp(tok, A_TIME:, 7) == 0) {
-dad-a_time = strtoll(tok+7, NULL, 10);
+dad-a_time = (time_t)strtol(tok+7, NULL, 10);
continue;
}
if (StrnCaseCmp(tok, C_TIME:, 7) == 0) {
-dad-c_time = strtoll(tok+7, NULL, 10);
+dad-c_time = (time_t)strtol(tok+7, NULL, 10);
continue;
}
if (StrnCaseCmp(tok, M_TIME:, 7) == 0) {
-dad-m_time = strtoll(tok+7, NULL, 10);
+dad-m_time = (time_t)strtol(tok+7, NULL, 10);
continue;
}
if (StrnCaseCmp(tok, INODE:, 6) == 0) {
-dad-inode = strtoll(tok+6, NULL, 10);
+dad-inode = (SMB_INO_T)atof(tok+6);
continue;
}
}
}
-
/*
-retrieve the acls for a file
+ Retrieve the acls for a file.
***/
+
static int cacl_get(SMBCCTX *context, TALLOC_CTX *ctx, SMBCSRV *srv,
struct cli_state *ipc_cli, POLICY_HND *pol,
char *filename, char *attr_name, char *buf, int bufsize)
@@ -4201,8 +4200,8 @@
if (determine_size) {
p = talloc_asprintf(
ctx,
-,SIZE:%llu,
-(unsigned long long) size);
+,SIZE:%.0f,
+(double)size);
if (!p) {
errno = ENOMEM;
return -1;
@@ -4210,15 +4209,15 @@
n = strlen(p);
} else {
n = snprintf(buf, bufsize,
- ,SIZE:%llu,
- (unsigned long long)
size);
+ ,SIZE:%.0f,
+ (double)size);
}
} else if (StrCaseCmp(name, size) == 0) {
if (determine_size) {
p = talloc_asprintf(
ctx,
-%llu,
-(unsigned long long) size);
+%.0f,
+(double)size);
if (!p) {
errno = ENOMEM;
return -1;
@@ -4226,8 +4225,8 @@
n = strlen(p);
} else {
n = snprintf(buf, bufsize,
- %llu,
-
svn commit: samba r11257 - in branches/SAMBA_4_0/source: . build/smb_build
Author: jelmer Date: 2005-10-21 22:49:23 + (Fri, 21 Oct 2005) New Revision: 11257 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=11257 Log: Add and use output function Modified: branches/SAMBA_4_0/source/build/smb_build/env.pm branches/SAMBA_4_0/source/build/smb_build/makefile.pm branches/SAMBA_4_0/source/main.mk Changeset: Sorry, the patch is too large (598 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=11257
Build status as of Sat Oct 22 00:00:02 2005
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2005-10-21 00:00:08.0 + +++ /home/build/master/cache/broken_results.txt 2005-10-22 00:00:09.0 + @@ -1,17 +1,17 @@ -Build status as of Fri Oct 21 00:00:02 2005 +Build status as of Sat Oct 22 00:00:02 2005 Build counts: Tree Total Broken Panic -ccache 10 2 0 -distcc 11 2 0 -lorikeet-heimdal 19 16 0 +ccache 11 2 0 +distcc 13 3 0 +lorikeet-heimdal 18 12 0 ppp 16 0 0 rsync35 2 0 samba3 0 0 samba-docs 0 0 0 -samba4 36 18 6 -samba_3_036 12 0 -smb-build25 5 0 +samba4 36 20 5 +samba_3_036 11 0 +smb-build27 5 0 talloc 34 14 0 tdb 34 4 0
svn commit: samba-docs r847 - in trunk/smbdotconf: misc printing security
Author: jht Date: 2005-10-22 00:04:38 + (Sat, 22 Oct 2005) New Revision: 847 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=847 Log: Fixes and reformatting from Bug #3190, plus a clean-up. Modified: trunk/smbdotconf/misc/dfreecommand.xml trunk/smbdotconf/printing/printcapname.xml trunk/smbdotconf/security/usekerberoskeytab.xml trunk/smbdotconf/security/usernamemap.xml Changeset: Sorry, the patch is too large (404 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=847
svn commit: samba-docs r848 - in trunk/manpages-3: .
Author: jht Date: 2005-10-22 00:21:20 + (Sat, 22 Oct 2005) New Revision: 848 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=848 Log: Fix Bug #3183. Modified: trunk/manpages-3/smbclient.1.xml Changeset: Sorry, the patch is too large (324 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=848
Re: svn commit: samba r11255 - in trunk/source: libsmb passdb
[EMAIL PROTECTED] writes:
Author: jra
Date: 2005-10-21 22:48:15 + (Fri, 21 Oct 2005)
New Revision: 11255
Log:
Remove use of long long and strtoll in libsmbclient (we
@@ -4201,8 +4200,8 @@
if (determine_size) {
p = talloc_asprintf(
ctx,
-,SIZE:%llu,
-(unsigned long long) size);
+,SIZE:%.0f,
+(double)size);
if (!p) {
errno = ENOMEM;
return -1;
If we're using %.0f as the format strings, then the cast on each of these
should be to float. If we want to cast to double, the format string should be
%.0lf.
Derrell
Re: svn commit: samba r11255 - in trunk/source: libsmb passdb
On Fri, Oct 21, 2005 at 08:49:45PM -0400, [EMAIL PROTECTED] wrote:
[EMAIL PROTECTED] writes:
Author: jra
Date: 2005-10-21 22:48:15 + (Fri, 21 Oct 2005)
New Revision: 11255
Log:
Remove use of long long and strtoll in libsmbclient (we
@@ -4201,8 +4200,8 @@
if (determine_size) {
p = talloc_asprintf(
ctx,
-,SIZE:%llu,
-(unsigned long long) size);
+,SIZE:%.0f,
+(double)size);
if (!p) {
errno = ENOMEM;
return -1;
If we're using %.0f as the format strings, then the cast on each of these
should be to float. If we want to cast to double, the format string should be
%.0lf.
Nope. From the printf format argument spec :
f,FThe double argument is rounded and converted to decimal notation
Remember, there's no such thing as float as a function arg, it's
always cast to double, just like char - int.
Jeremy.
svn commit: samba r11258 - in branches/SAMBA_4_0/source/librpc/idl: .
Author: tpot Date: 2005-10-22 01:12:46 + (Sat, 22 Oct 2005) New Revision: 11258 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=11258 Log: Dissect all access_required fields as hex using the same hf. Modified: branches/SAMBA_4_0/source/librpc/idl/winreg.cnf Changeset: Modified: branches/SAMBA_4_0/source/librpc/idl/winreg.cnf === --- branches/SAMBA_4_0/source/librpc/idl/winreg.cnf 2005-10-21 22:49:23 UTC (rev 11257) +++ branches/SAMBA_4_0/source/librpc/idl/winreg.cnf 2005-10-22 01:12:46 UTC (rev 11258) @@ -1,3 +1,12 @@ IMPORT security_secinfooffset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_winreg_winreg_GetKeySecurity_sec_info, NULL); -INFO_KEY OpenKey.Ke \ No newline at end of file +HF_FIELD hf_winreg_access_required Access Required winreg.access_required FT_UINT32 BASE_HEX NULL 0 + +HF_RENAME hf_winreg_winreg_OpenHKCR_access_required hf_winreg_access_required +HF_RENAME hf_winreg_winreg_OpenHKLM_access_required hf_winreg_access_required +HF_RENAME hf_winreg_winreg_OpenHKU_access_required hf_winreg_access_required +HF_RENAME hf_winreg_winreg_CreateKey_access_required hf_winreg_access_required +HF_RENAME hf_winreg_winreg_OpenHKCC_access_required hf_winreg_access_required +HF_RENAME hf_winreg_winreg_OpenHKDD_access_required hf_winreg_access_required +HF_RENAME hf_winreg_winreg_OpenHKPT_access_required hf_winreg_access_required +HF_RENAME hf_winreg_winreg_OpenHKPN_access_required hf_winreg_access_required
Re: svn commit: samba r11255 - in trunk/source: libsmb passdb
Jeremy Allison [EMAIL PROTECTED] writes: Nope. From the printf format argument spec : f,FThe double argument is rounded and converted to decimal notation Yup, you're right. I was thinking of scanf() format strings. Sorry. Derrell
