svn commit: samba r15644 - in branches/SAMBA_3_0/source/include: .
Author: paulg Date: 2006-05-16 17:02:26 + (Tue, 16 May 2006) New Revision: 15644 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=15644 Log: Now that we are referencing uint32_t and other data types defined in stdint.h, ensure that it is present. (Not all implementations pull it in when sys/types.h is used). Paul Modified: branches/SAMBA_3_0/source/include/includes.h Changeset: Modified: branches/SAMBA_3_0/source/include/includes.h === --- branches/SAMBA_3_0/source/include/includes.h2006-05-16 16:59:08 UTC (rev 15643) +++ branches/SAMBA_3_0/source/include/includes.h2006-05-16 17:02:26 UTC (rev 15644) @@ -93,6 +93,10 @@ #include sys/types.h +#ifdef HAVE_STDINT_H +#include stdint.h +#endif + #ifdef TIME_WITH_SYS_TIME #include sys/time.h #include time.h
svn commit: samba r15645 - in trunk/source/include: .
Author: paulg Date: 2006-05-16 17:04:56 + (Tue, 16 May 2006) New Revision: 15645 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=15645 Log: Now that we are referencing uint32_t and other data types defined in stdint.h, ensure that it is present. (Not all implementations pull it in when sys/types.h is used). Paul Modified: trunk/source/include/includes.h Changeset: Modified: trunk/source/include/includes.h === --- trunk/source/include/includes.h 2006-05-16 17:02:26 UTC (rev 15644) +++ trunk/source/include/includes.h 2006-05-16 17:04:56 UTC (rev 15645) @@ -93,6 +93,10 @@ #include sys/types.h +#ifdef HAVE_STDINT_H +#include stdint.h +#endif + #ifdef TIME_WITH_SYS_TIME #include sys/time.h #include time.h
svn commit: samba r15646 - branches/SAMBA_3_0/source/utils trunk/source/utils
Author: idra
Date: 2006-05-16 17:40:28 + (Tue, 16 May 2006)
New Revision: 15646
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=15646
Log:
Implement an setdomainsid command as well
Modified:
branches/SAMBA_3_0/source/utils/net.c
branches/SAMBA_3_0/source/utils/net_help.c
trunk/source/utils/net.c
trunk/source/utils/net_help.c
Changeset:
Modified: branches/SAMBA_3_0/source/utils/net.c
===
--- branches/SAMBA_3_0/source/utils/net.c 2006-05-16 17:04:56 UTC (rev
15645)
+++ branches/SAMBA_3_0/source/utils/net.c 2006-05-16 17:40:28 UTC (rev
15646)
@@ -596,6 +596,26 @@
return 0;
}
+static int net_setdomainsid(int argc, const char **argv)
+{
+ DOM_SID sid;
+
+ if ( (argc != 1)
+|| (strncmp(argv[0], S-1-5-21-, strlen(S-1-5-21-)) != 0)
+|| (!string_to_sid(sid, argv[0]))
+|| (sid.num_auths != 4)) {
+ d_printf(usage: net setdomainsid S-1-5-21-x-y-z\n);
+ return 1;
+ }
+
+ if (!secrets_store_domain_sid(lp_workgroup(), sid)) {
+ DEBUG(0,(Can't store domain SID.\n));
+ return 1;
+ }
+
+ return 0;
+}
+
static int net_getdomainsid(int argc, const char **argv)
{
DOM_SID domain_sid;
@@ -793,6 +813,7 @@
{CACHE, net_cache},
{GETLOCALSID, net_getlocalsid},
{SETLOCALSID, net_setlocalsid},
+ {SETDOMAINSID, net_setdomainsid},
{GETDOMAINSID, net_getdomainsid},
{MAXRID, net_maxrid},
{IDMAP, net_idmap},
Modified: branches/SAMBA_3_0/source/utils/net_help.c
===
--- branches/SAMBA_3_0/source/utils/net_help.c 2006-05-16 17:04:56 UTC (rev
15645)
+++ branches/SAMBA_3_0/source/utils/net_help.c 2006-05-16 17:40:28 UTC (rev
15646)
@@ -61,7 +61,7 @@
Valid functions are:\n\
RPC RAP ADS FILE SHARE SESSION SERVER DOMAIN PRINTQ USER GROUP VALIDATE\n\
GROUPMEMBER ADMIN SERVICE PASSWORD TIME LOOKUP GETLOCALSID SETLOCALSID\n\
- CHANGESCRETPW LOOKUP SAM\n);
+ SETDOMAINSID CHANGESCRETPW LOOKUP SAM\n);
return -1;
}
@@ -230,6 +230,7 @@
net cache\t\tto operate on cache tdb file\n\
net getlocalsid [NAME]\tto get the SID for local name\n\
net setlocalsid SID\tto set the local domain SID\n\
+ net setdomainsid SID\tto set the domain SID on member
servers\n\
net changesecretpw\tto change the machine password in the
local secrets database only\n\
\tthis requires the -f flag as a safety
barrier\n\
net status\t\tShow server status\n\
Modified: trunk/source/utils/net.c
===
--- trunk/source/utils/net.c2006-05-16 17:04:56 UTC (rev 15645)
+++ trunk/source/utils/net.c2006-05-16 17:40:28 UTC (rev 15646)
@@ -596,6 +596,26 @@
return 0;
}
+static int net_setdomainsid(int argc, const char **argv)
+{
+ DOM_SID sid;
+
+ if ( (argc != 1)
+|| (strncmp(argv[0], S-1-5-21-, strlen(S-1-5-21-)) != 0)
+|| (!string_to_sid(sid, argv[0]))
+|| (sid.num_auths != 4)) {
+ d_printf(usage: net setdomainsid S-1-5-21-x-y-z\n);
+ return 1;
+ }
+
+ if (!secrets_store_domain_sid(lp_workgroup(), sid)) {
+ DEBUG(0,(Can't store domain SID.\n));
+ return 1;
+ }
+
+ return 0;
+}
+
static int net_getdomainsid(int argc, const char **argv)
{
DOM_SID domain_sid;
@@ -793,6 +813,7 @@
{CACHE, net_cache},
{GETLOCALSID, net_getlocalsid},
{SETLOCALSID, net_setlocalsid},
+ {SETDOMAINSID, net_setdomainsid},
{GETDOMAINSID, net_getdomainsid},
{MAXRID, net_maxrid},
{IDMAP, net_idmap},
Modified: trunk/source/utils/net_help.c
===
--- trunk/source/utils/net_help.c 2006-05-16 17:04:56 UTC (rev 15645)
+++ trunk/source/utils/net_help.c 2006-05-16 17:40:28 UTC (rev 15646)
@@ -61,7 +61,7 @@
Valid functions are:\n\
RPC RAP ADS FILE SHARE SESSION SERVER DOMAIN PRINTQ USER GROUP VALIDATE\n\
GROUPMEMBER ADMIN SERVICE PASSWORD TIME LOOKUP GETLOCALSID SETLOCALSID\n\
- CHANGESCRETPW LOOKUP SAM\n);
+ SETDOMAINSID CHANGESCRETPW LOOKUP SAM\n);
return -1;
}
@@ -230,6 +230,7 @@
net cache\t\tto operate on cache tdb file\n\
net getlocalsid [NAME]\tto get the SID for local name\n\
net setlocalsid SID\tto set the local domain SID\n\
+ net setdomainsid SID\tto set the domain SID on member
servers\n\
net changesecretpw\tto change the machine password in the
local secrets database only\n\
svn commit: samba r15647 - in branches/SAMBA_4_0/source/lib/smbreadline: .
Author: jelmer Date: 2006-05-16 19:52:19 + (Tue, 16 May 2006) New Revision: 15647 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=15647 Log: Ignore .d files Modified: branches/SAMBA_4_0/source/lib/smbreadline/ Changeset: Property changes on: branches/SAMBA_4_0/source/lib/smbreadline ___ Name: svn:ignore + *.d
svn commit: samba r15648 - in branches/SAMBA_4_0/source/pidl: .
Author: jelmer Date: 2006-05-16 19:54:31 + (Tue, 16 May 2006) New Revision: 15648 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=15648 Log: Update MANIFEST to install Samba3 code generators. Modified: branches/SAMBA_4_0/source/pidl/MANIFEST Changeset: Modified: branches/SAMBA_4_0/source/pidl/MANIFEST === --- branches/SAMBA_4_0/source/pidl/MANIFEST 2006-05-16 19:52:19 UTC (rev 15647) +++ branches/SAMBA_4_0/source/pidl/MANIFEST 2006-05-16 19:54:31 UTC (rev 15648) @@ -7,6 +7,13 @@ tests/ndr_align.pl tests/ndr_alloc.pl tests/ndr_array.pl +lib/Parse/Pidl/Samba3/Client.pm +lib/Parse/Pidl/Samba3/ClientNDR.pm +lib/Parse/Pidl/Samba3/Header.pm +lib/Parse/Pidl/Samba3/Parser.pm +lib/Parse/Pidl/Samba3/Server.pm +lib/Parse/Pidl/Samba3/Template.pm +lib/Parse/Pidl/Samba3/Types.pm lib/Parse/Pidl/Samba4/NDR/Server.pm lib/Parse/Pidl/Samba4/NDR/Parser.pm lib/Parse/Pidl/Samba4/NDR/Client.pm @@ -18,6 +25,7 @@ lib/Parse/Pidl/Samba4/TDR.pm lib/Parse/Pidl/Samba4/Template.pm lib/Parse/Pidl/Samba4/EJS.pm +lib/Parse/Pidl/Samba4.pm lib/Parse/Pidl/Ethereal/Conformance.pm lib/Parse/Pidl/Ethereal/NDR.pm lib/Parse/Pidl/Typelist.pm
svn commit: samba r15649 - branches/SAMBA_3_0/source/include branches/SAMBA_3_0/source/passdb trunk/source/include trunk/source/passdb
Author: gd
Date: 2006-05-16 22:03:05 + (Tue, 16 May 2006)
New Revision: 15649
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=15649
Log:
Allow to store 24 password history entries in ldapsam (same limit as on
Windows). Fixes bug #1914.
Guenther
Modified:
branches/SAMBA_3_0/source/include/smb.h
branches/SAMBA_3_0/source/passdb/pdb_ldap.c
trunk/source/include/smb.h
trunk/source/passdb/pdb_ldap.c
Changeset:
Modified: branches/SAMBA_3_0/source/include/smb.h
===
--- branches/SAMBA_3_0/source/include/smb.h 2006-05-16 19:54:31 UTC (rev
15648)
+++ branches/SAMBA_3_0/source/include/smb.h 2006-05-16 22:03:05 UTC (rev
15649)
@@ -738,6 +738,7 @@
#define PW_HISTORY_SALT_LEN 16
#define SALTED_MD5_HASH_LEN 16
#define PW_HISTORY_ENTRY_LEN (PW_HISTORY_SALT_LEN+SALTED_MD5_HASH_LEN)
+#define MAX_PW_HISTORY_LEN 24
/*
* Flags for account policy.
Modified: branches/SAMBA_3_0/source/passdb/pdb_ldap.c
===
--- branches/SAMBA_3_0/source/passdb/pdb_ldap.c 2006-05-16 19:54:31 UTC (rev
15648)
+++ branches/SAMBA_3_0/source/passdb/pdb_ldap.c 2006-05-16 22:03:05 UTC (rev
15649)
@@ -773,9 +773,9 @@
if (pwHistLen 0){
uint8 *pwhist = NULL;
int i;
+ char history_string[MAX_PW_HISTORY_LEN*64];
- /* We can only store (sizeof(pstring)-1)/64 password history
entries. */
- pwHistLen = MIN(pwHistLen, ((sizeof(temp)-1)/64));
+ pwHistLen = MIN(pwHistLen, MAX_PW_HISTORY_LEN);
if ((pwhist = SMB_MALLOC(pwHistLen * PW_HISTORY_ENTRY_LEN)) ==
NULL){
DEBUG(0, (init_sam_from_ldap: malloc failed!\n));
@@ -783,19 +783,20 @@
}
memset(pwhist, '\0', pwHistLen * PW_HISTORY_ENTRY_LEN);
- if (!smbldap_get_single_pstring
(ldap_state-smbldap_state-ldap_struct, entry,
- get_userattr_key2string(ldap_state-schema_ver,
LDAP_ATTR_PWD_HISTORY), temp)) {
+ if
(!smbldap_get_single_attribute(ldap_state-smbldap_state-ldap_struct, entry,
+
get_userattr_key2string(ldap_state-schema_ver, LDAP_ATTR_PWD_HISTORY),
+ history_string,
sizeof(history_string))) {
/* leave as default - zeros */
} else {
BOOL hex_failed = False;
for (i = 0; i pwHistLen; i++){
/* Get the 16 byte salt. */
- if (!pdb_gethexpwd(temp[i*64],
pwhist[i*PW_HISTORY_ENTRY_LEN])) {
+ if (!pdb_gethexpwd(history_string[i*64],
pwhist[i*PW_HISTORY_ENTRY_LEN])) {
hex_failed = True;
break;
}
/* Get the 16 byte MD5 hash of salt+passwd. */
- if (!pdb_gethexpwd(temp[(i*64)+32],
+ if (!pdb_gethexpwd(history_string[(i*64)+32],
pwhist[(i*PW_HISTORY_ENTRY_LEN)+PW_HISTORY_SALT_LEN])) {
hex_failed = True;
break;
Modified: trunk/source/include/smb.h
===
--- trunk/source/include/smb.h 2006-05-16 19:54:31 UTC (rev 15648)
+++ trunk/source/include/smb.h 2006-05-16 22:03:05 UTC (rev 15649)
@@ -735,6 +735,7 @@
#define PW_HISTORY_SALT_LEN 16
#define SALTED_MD5_HASH_LEN 16
#define PW_HISTORY_ENTRY_LEN (PW_HISTORY_SALT_LEN+SALTED_MD5_HASH_LEN)
+#define MAX_PW_HISTORY_LEN 24
/*
* Flags for account policy.
Modified: trunk/source/passdb/pdb_ldap.c
===
--- trunk/source/passdb/pdb_ldap.c 2006-05-16 19:54:31 UTC (rev 15648)
+++ trunk/source/passdb/pdb_ldap.c 2006-05-16 22:03:05 UTC (rev 15649)
@@ -773,9 +773,9 @@
if (pwHistLen 0){
uint8 *pwhist = NULL;
int i;
+ char history_string[MAX_PW_HISTORY_LEN*64];
- /* We can only store (sizeof(pstring)-1)/64 password history
entries. */
- pwHistLen = MIN(pwHistLen, ((sizeof(temp)-1)/64));
+ pwHistLen = MIN(pwHistLen, MAX_PW_HISTORY_LEN);
if ((pwhist = SMB_MALLOC(pwHistLen * PW_HISTORY_ENTRY_LEN)) ==
NULL){
DEBUG(0, (init_sam_from_ldap: malloc failed!\n));
@@ -783,19 +783,20 @@
}
memset(pwhist, '\0', pwHistLen * PW_HISTORY_ENTRY_LEN);
- if (!smbldap_get_single_pstring
(ldap_state-smbldap_state-ldap_struct, entry,
-
svn commit: samba r15650 - in branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl: .
Author: jelmer
Date: 2006-05-16 22:21:44 + (Tue, 16 May 2006)
New Revision: 15650
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=15650
Log:
Fix perl warning when generating IDL for elements with no properties
Modified:
branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Dump.pm
Changeset:
Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Dump.pm
===
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Dump.pm 2006-05-16
22:03:05 UTC (rev 15649)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Dump.pm 2006-05-16
22:21:44 UTC (rev 15650)
@@ -36,7 +36,7 @@
sub DumpProperties($)
{
my($props) = shift;
-my($res);
+my $res = ;
foreach my $d ($props) {
foreach my $k (keys %{$d}) {
@@ -63,7 +63,7 @@
sub DumpElement($)
{
my($element) = shift;
-my($res);
+my $res = ;
(defined $element-{PROPERTIES})
($res .= DumpProperties($element-{PROPERTIES}));
@@ -89,10 +89,9 @@
$res .= struct {\n;
if (defined $struct-{ELEMENTS}) {
- foreach my $e (@{$struct-{ELEMENTS}}) {
- $res .= \t . DumpElement($e);
- $res .= ;\n;
- }
+ foreach (@{$struct-{ELEMENTS}}) {
+ $res .= \t . DumpElement($_) . ;\n;
+ }
}
$res .= };
svn commit: samba r15651 - in branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Ethereal: .
Author: jelmer
Date: 2006-05-16 22:25:13 + (Tue, 16 May 2006)
New Revision: 15651
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=15651
Log:
Add 'MANUAL' command in Ethereal conformance files. This allows overriding
individual functions for specific element levels without losing the other
functions for an element or the hf/ett fields allocated.
Fixes #3738.
Modified:
branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Ethereal/Conformance.pm
branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Ethereal/NDR.pm
Changeset:
Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Ethereal/Conformance.pm
===
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Ethereal/Conformance.pm
2006-05-16 22:21:44 UTC (rev 15650)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Ethereal/Conformance.pm
2006-05-16 22:25:13 UTC (rev 15651)
@@ -74,6 +74,13 @@
Override the text shown when a bitmap boolean value is enabled or disabled.
+=item IMANUAL fn_name
+
+Force pidl to not generate a particular function but allow the user
+to write a function manually. This can be used to remove the function
+for only one level for a particular element rather then all the functions and
+ett/hf variables for a particular element as the NOEMIT command does.
+
=back
=head1 EXAMPLE
@@ -232,9 +239,7 @@
sub handle_noemit($$$)
{
- my $pos = shift;
- my $data = shift;
- my $type = shift;
+ my ($pos,$data,$type) = @_;
if (defined($type)) {
$data-{noemit}-{$type} = 1;
@@ -243,6 +248,13 @@
}
}
+sub handle_manual($$$)
+{
+ my ($pos,$data,$fn) = @_;
+
+$data-{manual}-{$fn} = 1;
+}
+
sub handle_protocol($$)
{
my ($pos, $data, $name, $longname, $shortname, $filtername) = @_;
@@ -287,6 +299,7 @@
my %field_handlers = (
TYPE = \handle_type,
NOEMIT = \handle_noemit,
+ MANUAL = \handle_manual,
PARAM_VALUE = \handle_param_value,
HF_FIELD = \handle_hf_field,
HF_RENAME = \handle_hf_rename,
Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Ethereal/NDR.pm
===
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Ethereal/NDR.pm
2006-05-16 22:21:44 UTC (rev 15650)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Ethereal/NDR.pm
2006-05-16 22:25:13 UTC (rev 15651)
@@ -72,9 +72,24 @@
my %res = ();
my $tabs = ;
+my $cur_fn = undef;
+sub pidl_fn_start($)
+{
+ my $fn = shift;
+ $cur_fn = $fn;
+}
+sub pidl_fn_end($)
+{
+ my $fn = shift;
+ die(Inconsistent state: $fn != $cur_fn) if ($fn ne $cur_fn);
+ $cur_fn = undef;
+}
+
sub pidl_code($)
{
my $d = shift;
+ return if (defined($cur_fn) and
defined($conformance-{manual}-{$cur_fn}));
+
if ($d) {
$res{code} .= $tabs;
$res{code} .= $d;
@@ -124,7 +139,7 @@
return if (defined($conformance-{noemit}-{StripPrefixes($name)}));
- foreach (@{$e-{ELEMENTS}}) {
+ foreach (@{$e-{ELEMENTS}}) {
if (/([^=]*)=(.*)/) {
pidl_hdr #define $1 ($2);
}
@@ -142,6 +157,7 @@
pidl_def { 0, NULL };
pidl_def };;
+ pidl_fn_start $dissectorname;
pidl_code int;
pidl_code $dissectorname(tvbuff_t *tvb, int offset, packet_info
*pinfo, proto_tree *tree, guint8 *drep, int hf_index, guint32 param _U_);
pidl_code {;
@@ -150,6 +166,7 @@
pidl_code return offset;;
deindent;
pidl_code }\n;
+ pidl_fn_end $dissectorname;
my $enum_size = $e-{BASE_TYPE};
$enum_size =~ s/uint//g;
@@ -165,6 +182,7 @@
pidl_hdr int $dissectorname(tvbuff_t *tvb, int offset, packet_info
*pinfo, proto_tree *tree, guint8 *drep, int hf_index, guint32 param);;
+ pidl_fn_start $dissectorname;
pidl_code int;
pidl_code $dissectorname(tvbuff_t *tvb, int offset, packet_info
*pinfo, proto_tree *parent_tree, guint8 *drep, int hf_index, guint32 param
_U_);
pidl_code {;
@@ -230,6 +248,7 @@
pidl_code return offset;;
deindent;
pidl_code }\n;
+ pidl_fn_end $dissectorname;
my $size = $e-{BASE_TYPE};
$size =~ s/uint//g;
@@ -376,6 +395,7 @@
foreach (@{$e-{LEVELS}}) {
next if ($_-{TYPE} eq SWITCH);
pidl_def static int $dissectorname$add(tvbuff_t *tvb, int
offset, packet_info *pinfo, proto_tree *tree, guint8 *drep);;
+ pidl_fn_start $dissectorname$add;
pidl_code static int;
pidl_code $dissectorname$add(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree, guint8 *drep);
pidl_code {;
@@ -387,6 +407,7 @@
pidl_code return offset;;
deindent;
pidl_code }\n;
+
svn commit: samba r15652 - in branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl: .
Author: jelmer
Date: 2006-05-16 23:49:31 + (Tue, 16 May 2006)
New Revision: 15652
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=15652
Log:
Fix aliases mechanism (fixes #3710)
Modified:
branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/NDR.pm
branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Typelist.pm
Changeset:
Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/NDR.pm
===
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/NDR.pm2006-05-16
22:25:13 UTC (rev 15651)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/NDR.pm2006-05-16
23:49:31 UTC (rev 15652)
@@ -37,7 +37,7 @@
@EXPORT = qw(GetPrevLevel GetNextLevel ContainsDeferred ContainsString);
use strict;
-use Parse::Pidl::Typelist qw(hasType getType);
+use Parse::Pidl::Typelist qw(hasType getType expandAlias);
use Parse::Pidl::Util qw(has_property property_matches);
# Alignment of the built-in scalar types
@@ -364,6 +364,8 @@
{
my $e = shift;
+ $e-{TYPE} = expandAlias($e-{TYPE});
+
return {
NAME = $e-{NAME},
TYPE = $e-{TYPE},
@@ -549,7 +551,7 @@
}
if ($d-{RETURN_TYPE} ne void) {
- $rettype = $d-{RETURN_TYPE};
+ $rettype = expandAlias($d-{RETURN_TYPE});
}
my $async = 0;
Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Typelist.pm
===
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Typelist.pm 2006-05-16
22:25:13 UTC (rev 15651)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Typelist.pm 2006-05-16
23:49:31 UTC (rev 15652)
@@ -7,7 +7,7 @@
require Exporter;
@ISA = qw(Exporter);
[EMAIL PROTECTED] = qw(hasType getType mapType scalar_is_reference);
[EMAIL PROTECTED] = qw(hasType getType mapType scalar_is_reference expandAlias);
use vars qw($VERSION);
$VERSION = '0.01';
@@ -72,6 +72,29 @@
ipv4address = const char *,
);
+my %aliases = (
+ error_status_t = uint32,
+ boolean8 = uint8,
+ boolean32 = uint32,
+ DWORD = uint32,
+ int = int32,
+ WORD = uint16,
+ char = uint8,
+ long = int32,
+ short = int16,
+ HYPER_T = hyper,
+ HRESULT = COMRESULT,
+);
+
+sub expandAlias($)
+{
+ my $name = shift;
+
+ return $aliases{$name} if defined($aliases{$name});
+
+ return $name;
+}
+
# map from a IDL type to a C header type
sub mapScalarType($)
{
@@ -148,24 +171,6 @@
}
}
-my %aliases = (
- DWORD = uint32,
- int = int32,
- WORD = uint16,
- char = uint8,
- long = int32,
- short = int16,
- HYPER_T = hyper,
- HRESULT = COMRESULT,
-);
-
-sub RegisterAliases()
-{
- foreach (keys %aliases) {
- $typedefs{$_} = $typedefs{$aliases{$_}};
- }
-}
-
sub enum_type_fn($)
{
my $enum = shift;
@@ -196,6 +201,7 @@
my $t = shift;
return void unless defined($t);
my $dt;
+ $t = expandAlias($t);
unless ($dt or ($dt = getType($t))) {
# Best guess
@@ -237,6 +243,5 @@
}
RegisterScalars();
-RegisterAliases();
1;
svn commit: samba r15653 - in branches/SAMBA_4_0/source/librpc/idl: .
Author: jelmer Date: 2006-05-16 23:51:01 + (Tue, 16 May 2006) New Revision: 15653 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=15653 Log: Remove idl_types.h include where possible. Remove types from .h file that are now in pidls' aliases list. Modified: branches/SAMBA_4_0/source/librpc/idl/atsvc.idl branches/SAMBA_4_0/source/librpc/idl/dcom.idl branches/SAMBA_4_0/source/librpc/idl/dfs.idl branches/SAMBA_4_0/source/librpc/idl/dnsserver.idl branches/SAMBA_4_0/source/librpc/idl/dssetup.idl branches/SAMBA_4_0/source/librpc/idl/echo.idl branches/SAMBA_4_0/source/librpc/idl/efs.idl branches/SAMBA_4_0/source/librpc/idl/idl_types.h branches/SAMBA_4_0/source/librpc/idl/mgmt.idl branches/SAMBA_4_0/source/librpc/idl/misc.idl branches/SAMBA_4_0/source/librpc/idl/netlogon.idl branches/SAMBA_4_0/source/librpc/idl/opendb.idl branches/SAMBA_4_0/source/librpc/idl/oxidresolver.idl branches/SAMBA_4_0/source/librpc/idl/protected_storage.idl branches/SAMBA_4_0/source/librpc/idl/remact.idl branches/SAMBA_4_0/source/librpc/idl/rot.idl branches/SAMBA_4_0/source/librpc/idl/samr.idl branches/SAMBA_4_0/source/librpc/idl/unixinfo.idl branches/SAMBA_4_0/source/librpc/idl/winreg.idl branches/SAMBA_4_0/source/librpc/idl/wkssvc.idl Changeset: Modified: branches/SAMBA_4_0/source/librpc/idl/atsvc.idl === --- branches/SAMBA_4_0/source/librpc/idl/atsvc.idl 2006-05-16 23:49:31 UTC (rev 15652) +++ branches/SAMBA_4_0/source/librpc/idl/atsvc.idl 2006-05-16 23:51:01 UTC (rev 15653) @@ -2,8 +2,6 @@ atsvc interface definition */ -#include idl_types.h - [ uuid(1ff70682-0a51-30e8-076d-740be8cee98b), version(1.0), pointer_default(unique), Modified: branches/SAMBA_4_0/source/librpc/idl/dcom.idl === --- branches/SAMBA_4_0/source/librpc/idl/dcom.idl 2006-05-16 23:49:31 UTC (rev 15652) +++ branches/SAMBA_4_0/source/librpc/idl/dcom.idl 2006-05-16 23:51:01 UTC (rev 15653) @@ -1,5 +1,3 @@ -#include idl_types.h - /** DCOM interfaces http://www.ietf.org/internet-drafts/draft-brown-dcom-v1-spec-04.txt Modified: branches/SAMBA_4_0/source/librpc/idl/dfs.idl === --- branches/SAMBA_4_0/source/librpc/idl/dfs.idl2006-05-16 23:49:31 UTC (rev 15652) +++ branches/SAMBA_4_0/source/librpc/idl/dfs.idl2006-05-16 23:51:01 UTC (rev 15653) @@ -2,8 +2,6 @@ dfs interface definition */ -#include idl_types.h - [ uuid(4fc742e0-4a10-11cf-8273-00aa004ae673), version(3.0), pointer_default(unique), Modified: branches/SAMBA_4_0/source/librpc/idl/dnsserver.idl === --- branches/SAMBA_4_0/source/librpc/idl/dnsserver.idl 2006-05-16 23:49:31 UTC (rev 15652) +++ branches/SAMBA_4_0/source/librpc/idl/dnsserver.idl 2006-05-16 23:51:01 UTC (rev 15653) @@ -2,8 +2,6 @@ dnsserver interface definition */ -#include idl_types.h - [ uuid(50abc2a4-574d-40b3-9d66-ee4fd5fba076), version(5.0), pointer_default(unique), Modified: branches/SAMBA_4_0/source/librpc/idl/dssetup.idl === --- branches/SAMBA_4_0/source/librpc/idl/dssetup.idl2006-05-16 23:49:31 UTC (rev 15652) +++ branches/SAMBA_4_0/source/librpc/idl/dssetup.idl2006-05-16 23:51:01 UTC (rev 15653) @@ -1,5 +1,3 @@ -#include idl_types.h - /* dssetup interface definition */ Modified: branches/SAMBA_4_0/source/librpc/idl/echo.idl === --- branches/SAMBA_4_0/source/librpc/idl/echo.idl 2006-05-16 23:49:31 UTC (rev 15652) +++ branches/SAMBA_4_0/source/librpc/idl/echo.idl 2006-05-16 23:51:01 UTC (rev 15653) @@ -1,6 +1,4 @@ -#include idl_types.h - [ uuid(60a15ec5-4de8-11d7-a637-005056a20182), endpoint(ncacn_np:[\\pipe\\rpcecho], ncacn_ip_tcp:, ncalrpc:), Modified: branches/SAMBA_4_0/source/librpc/idl/efs.idl === --- branches/SAMBA_4_0/source/librpc/idl/efs.idl2006-05-16 23:49:31 UTC (rev 15652) +++ branches/SAMBA_4_0/source/librpc/idl/efs.idl2006-05-16 23:51:01 UTC (rev 15653) @@ -1,4 +1,3 @@ -#include idl_types.h /* IDL definitions from original packet-dcerpc-efs.c by Jean-Baptiste Marchand Modified: branches/SAMBA_4_0/source/librpc/idl/idl_types.h === --- branches/SAMBA_4_0/source/librpc/idl/idl_types.h2006-05-16 23:49:31 UTC (rev 15652) +++ branches/SAMBA_4_0/source/librpc/idl/idl_types.h2006-05-16 23:51:01 UTC (rev 15653) @@ -80,17 +80,7 @@ #define NDR_LITTLE_ENDIAN LIBNDR_FLAG_LITTLE_ENDIAN #define NDR_BIG_ENDIAN LIBNDR_FLAG_BIGENDIAN - /* - these are used by the
Build status as of Wed May 17 00:00:02 2006
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2006-05-16 00:00:04.0 + +++ /home/build/master/cache/broken_results.txt 2006-05-17 00:00:49.0 + @@ -1,17 +1,17 @@ -Build status as of Tue May 16 00:00:02 2006 +Build status as of Wed May 17 00:00:02 2006 Build counts: Tree Total Broken Panic -ccache 37 3 0 +ccache 37 4 0 distcc 38 3 0 lorikeet-heimdal 34 22 0 ppp 21 0 0 -rsync37 2 0 +rsync37 4 0 samba6 2 0 samba-docs 0 0 0 -samba4 41 29 10 +samba4 41 32 10 samba_3_038 12 0 -smb-build29 0 0 +smb-build30 0 0 talloc 34 15 0 tdb 34 4 0
svn commit: samba r15654 - branches/SAMBA_3_0/source branches/SAMBA_3_0/source/popt trunk/source trunk/source/popt
Author: jpeach Date: 2006-05-17 00:04:09 + (Wed, 17 May 2006) New Revision: 15654 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=15654 Log: Update our internal copy of popt to that distributed with the RPM 4.2 source code. Modified: branches/SAMBA_3_0/source/Makefile.in branches/SAMBA_3_0/source/configure.in branches/SAMBA_3_0/source/popt/CHANGES branches/SAMBA_3_0/source/popt/README branches/SAMBA_3_0/source/popt/findme.c branches/SAMBA_3_0/source/popt/findme.h branches/SAMBA_3_0/source/popt/popt.c branches/SAMBA_3_0/source/popt/popt.h branches/SAMBA_3_0/source/popt/poptconfig.c branches/SAMBA_3_0/source/popt/popthelp.c branches/SAMBA_3_0/source/popt/poptint.h branches/SAMBA_3_0/source/popt/poptparse.c branches/SAMBA_3_0/source/popt/system.h trunk/source/Makefile.in trunk/source/configure.in trunk/source/popt/CHANGES trunk/source/popt/README trunk/source/popt/findme.c trunk/source/popt/findme.h trunk/source/popt/popt.c trunk/source/popt/popt.h trunk/source/popt/poptconfig.c trunk/source/popt/popthelp.c trunk/source/popt/poptint.h trunk/source/popt/poptparse.c trunk/source/popt/system.h Changeset: Sorry, the patch is too large (7737 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=15654
svn commit: samba r15655 - branches/SAMBA_3_0/source/lib trunk/source/lib
Author: jpeach
Date: 2006-05-17 00:51:42 + (Wed, 17 May 2006)
New Revision: 15655
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=15655
Log:
Log the result of module initialisation if it fails.
Modified:
branches/SAMBA_3_0/source/lib/module.c
trunk/source/lib/module.c
Changeset:
Modified: branches/SAMBA_3_0/source/lib/module.c
===
--- branches/SAMBA_3_0/source/lib/module.c 2006-05-17 00:04:09 UTC (rev
15654)
+++ branches/SAMBA_3_0/source/lib/module.c 2006-05-17 00:51:42 UTC (rev
15655)
@@ -61,10 +61,14 @@
return NT_STATUS_UNSUCCESSFUL;
}
+ DEBUG(2, (Module '%s' loaded\n, module_name));
+
status = init();
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(0, (Module '%s' initialization failed: %s\n,
+ module_name, get_friendly_nt_error_msg(status)));
+ }
- DEBUG(2, (Module '%s' loaded\n, module_name));
-
return status;
}
Modified: trunk/source/lib/module.c
===
--- trunk/source/lib/module.c 2006-05-17 00:04:09 UTC (rev 15654)
+++ trunk/source/lib/module.c 2006-05-17 00:51:42 UTC (rev 15655)
@@ -61,10 +61,14 @@
return NT_STATUS_UNSUCCESSFUL;
}
+ DEBUG(2, (Module '%s' loaded\n, module_name));
+
status = init();
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(0, (Module '%s' initialization failed: %s\n,
+ module_name, get_friendly_nt_error_msg(status)));
+ }
- DEBUG(2, (Module '%s' loaded\n, module_name));
-
return status;
}
svn commit: samba r15632 - branches/SAMBA_3_0/source/nsswitch trunk/source/nsswitch
Author: gd
Date: 2006-05-16 11:23:29 + (Tue, 16 May 2006)
New Revision: 15632
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=15632
Log:
Remove length limitation from the winbind cache cleanup traversal.
Guenther
Modified:
branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c
trunk/source/nsswitch/winbindd_cache.c
Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c
===
--- branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c 2006-05-16 02:50:49 UTC
(rev 15631)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c 2006-05-16 11:23:29 UTC
(rev 15632)
@@ -2101,19 +2101,14 @@
TDB_DATA dbuf, void *state)
{
struct cache_entry *centry;
- char buf[1024];
- if (!snprintf(buf, kbuf.dsize + 1, %s, kbuf.dptr)) {
- return 1;
- }
-
- centry = wcache_fetch_raw(buf);
+ centry = wcache_fetch_raw(kbuf.dptr);
if (!centry) {
return 0;
}
if (!NT_STATUS_IS_OK(centry-status)) {
- DEBUG(10,(deleting centry %s\n, buf));
+ DEBUG(10,(deleting centry %s\n, kbuf.dptr));
tdb_delete(the_tdb, kbuf);
}
Modified: trunk/source/nsswitch/winbindd_cache.c
===
--- trunk/source/nsswitch/winbindd_cache.c 2006-05-16 02:50:49 UTC (rev
15631)
+++ trunk/source/nsswitch/winbindd_cache.c 2006-05-16 11:23:29 UTC (rev
15632)
@@ -2223,19 +2223,14 @@
TDB_DATA dbuf, void *state)
{
struct cache_entry *centry;
- char buf[1024];
- if (!snprintf(buf, kbuf.dsize + 1, %s, kbuf.dptr)) {
- return 1;
- }
-
- centry = wcache_fetch_raw(buf);
+ centry = wcache_fetch_raw(kbuf.dptr);
if (!centry) {
return 0;
}
if (!NT_STATUS_IS_OK(centry-status)) {
- DEBUG(10,(deleting centry %s\n, buf));
+ DEBUG(10,(deleting centry %s\n, kbuf.dptr));
tdb_delete(the_tdb, kbuf);
}
svn commit: samba r15633 - branches/SAMBA_3_0/source/lib branches/SAMBA_3_0/source/passdb trunk/source/lib trunk/source/passdb
Author: gd
Date: 2006-05-16 13:26:49 + (Tue, 16 May 2006)
New Revision: 15633
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=15633
Log:
Minor smbldap/pdb_ldap cleanup
Guenther
Modified:
branches/SAMBA_3_0/source/lib/smbldap.c
branches/SAMBA_3_0/source/passdb/pdb_ldap.c
trunk/source/lib/smbldap.c
trunk/source/passdb/pdb_ldap.c
Changeset:
Modified: branches/SAMBA_3_0/source/lib/smbldap.c
===
--- branches/SAMBA_3_0/source/lib/smbldap.c 2006-05-16 11:23:29 UTC (rev
15632)
+++ branches/SAMBA_3_0/source/lib/smbldap.c 2006-05-16 13:26:49 UTC (rev
15633)
@@ -981,7 +981,7 @@
ldap_get_option(ldap_state-ldap_struct, LDAP_OPT_PROTOCOL_VERSION,
version);
- if (smbldap_has_control(ldap_state, ADS_PAGE_CTL_OID) version == 3) {
+ if (smbldap_has_control(ldap_state-ldap_struct, ADS_PAGE_CTL_OID)
version == 3) {
ldap_state-paged_results = True;
}
@@ -1554,7 +1554,6 @@
/***
Return a copy of the DN for a LDAPMessage. Convert from utf8 to CH_UNIX.
/
-
char *smbldap_get_dn(LDAP *ld, LDAPMessage *entry)
{
char *utf8_dn, *unix_dn;
@@ -1595,7 +1594,7 @@
Check if root-dse has a certain Control or Extension
/
-static BOOL smbldap_check_root_dse(struct smbldap_state *ldap_state, const
char **attrs, const char *value)
+static BOOL smbldap_check_root_dse(LDAP *ld, const char **attrs, const char
*value)
{
LDAPMessage *msg = NULL;
LDAPMessage *entry = NULL;
@@ -1615,7 +1614,7 @@
return False;
}
- rc = ldap_search_s(ldap_state-ldap_struct, , LDAP_SCOPE_BASE,
+ rc = ldap_search_s(ld, , LDAP_SCOPE_BASE,
(objectclass=*), CONST_DISCARD(char **, attrs), 0
, msg);
if (rc != LDAP_SUCCESS) {
@@ -1623,21 +1622,21 @@
return False;
}
- num_result = ldap_count_entries(ldap_state-ldap_struct, msg);
+ num_result = ldap_count_entries(ld, msg);
if (num_result != 1) {
DEBUG(3,(smbldap_check_root_dse: Expected one rootDSE, got
%d\n, num_result));
goto done;
}
- entry = ldap_first_entry(ldap_state-ldap_struct, msg);
+ entry = ldap_first_entry(ld, msg);
if (entry == NULL) {
DEBUG(3,(smbldap_check_root_dse: Could not retrieve
rootDSE\n));
goto done;
}
- values = ldap_get_values(ldap_state-ldap_struct, entry, attrs[0]);
+ values = ldap_get_values(ld, entry, attrs[0]);
if (values == NULL) {
DEBUG(5,(smbldap_check_root_dse: LDAP Server does not support
any %s\n, attrs[0]));
@@ -1671,28 +1670,28 @@
Check if LDAP-Server supports a certain Control (OID in string format)
/
-BOOL smbldap_has_control(struct smbldap_state *ldap_state, const char *control)
+BOOL smbldap_has_control(LDAP *ld, const char *control)
{
const char *attrs[] = { supportedControl, NULL };
- return smbldap_check_root_dse(ldap_state, attrs, control);
+ return smbldap_check_root_dse(ld, attrs, control);
}
/***
Check if LDAP-Server supports a certain Extension (OID in string format)
/
-BOOL smbldap_has_extension(struct smbldap_state *ldap_state, const char
*extension)
+BOOL smbldap_has_extension(LDAP *ld, const char *extension)
{
const char *attrs[] = { supportedExtension, NULL };
- return smbldap_check_root_dse(ldap_state, attrs, extension);
+ return smbldap_check_root_dse(ld, attrs, extension);
}
/***
Check if LDAP-Server holds a given namingContext
/
-BOOL smbldap_has_naming_context(struct smbldap_state *ldap_state, const char
*naming_context)
+BOOL smbldap_has_naming_context(LDAP *ld, const char *naming_context)
{
const char *attrs[] = { namingContexts, NULL };
- return smbldap_check_root_dse(ldap_state, attrs, naming_context);
+ return smbldap_check_root_dse(ld, attrs, naming_context);
}
Modified: branches/SAMBA_3_0/source/passdb/pdb_ldap.c
===
--- branches/SAMBA_3_0/source/passdb/pdb_ldap.c 2006-05-16 11:23:29 UTC (rev
15632)
+++ branches/SAMBA_3_0/source/passdb/pdb_ldap.c 2006-05-16 13:26:49 UTC (rev
15633)
@@ -212,7 +212,7 @@
return ntstatus;
}
- if (!smbldap_has_naming_context(ldap_state-smbldap_state,
svn commit: samba r15634 - branches/SAMBA_3_0/source branches/SAMBA_3_0/source/nsswitch trunk/source trunk/source/nsswitch
Author: gd
Date: 2006-05-16 14:29:39 + (Tue, 16 May 2006)
New Revision: 15634
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=15634
Log:
Prevent passwords of winbindd's list of credential caches from beeing
swapped to disc using mlock(). (patch was reviewed by Jeremy).
Guenther
Modified:
branches/SAMBA_3_0/source/configure.in
branches/SAMBA_3_0/source/nsswitch/winbindd.h
branches/SAMBA_3_0/source/nsswitch/winbindd_cred_cache.c
branches/SAMBA_3_0/source/nsswitch/winbindd_nss.h
trunk/source/configure.in
trunk/source/nsswitch/winbindd.h
trunk/source/nsswitch/winbindd_cred_cache.c
trunk/source/nsswitch/winbindd_nss.h
Changeset:
Modified: branches/SAMBA_3_0/source/configure.in
===
--- branches/SAMBA_3_0/source/configure.in 2006-05-16 13:26:49 UTC (rev
15633)
+++ branches/SAMBA_3_0/source/configure.in 2006-05-16 14:29:39 UTC (rev
15634)
@@ -1243,6 +1243,8 @@
AC_CHECK_FUNCS(syslog vsyslog timegm)
AC_CHECK_FUNCS(setlocale nl_langinfo)
AC_CHECK_FUNCS(nanosleep)
+AC_CHECK_FUNCS(mlock munlock mlockall munlockall)
+AC_CHECK_HEADERS(sys/mman.h)
# setbuffer, shmget, shm_open are needed for smbtorture
AC_CHECK_FUNCS(setbuffer shmget shm_open)
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd.h
===
--- branches/SAMBA_3_0/source/nsswitch/winbindd.h 2006-05-16 13:26:49 UTC
(rev 15633)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd.h 2006-05-16 14:29:39 UTC
(rev 15634)
@@ -33,6 +33,10 @@
#include libnscd.h
#endif
+#ifdef HAVE_SYS_MMAN_H
+#include sys/mman.h
+#endif
+
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_WINBIND
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_cred_cache.c
===
--- branches/SAMBA_3_0/source/nsswitch/winbindd_cred_cache.c2006-05-16
13:26:49 UTC (rev 15633)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_cred_cache.c2006-05-16
14:29:39 UTC (rev 15634)
@@ -74,6 +74,23 @@
if (strequal(entry-ccname, ccname)) {
DLIST_REMOVE(ccache_list, entry);
TALLOC_FREE(entry-event); /* unregisters events */
+#ifdef HAVE_MUNLOCK
+ if (entry-pass) {
+ size_t len = strlen(entry-pass)+1;
+#ifdef DEBUG_PASSWORD
+ DEBUG(10,(unlocking memory: %p\n,
entry-pass));
+#endif
+ memset((entry-pass), 0, len);
+ if ((munlock(entry-pass, len)) == -1) {
+ DEBUG(0,(failed to munlock memory: %s
(%d)\n,
+ strerror(errno), errno));
+ return map_nt_error_from_unix(errno);
+ }
+#ifdef DEBUG_PASSWORD
+ DEBUG(10,(munlocked memory: %p\n,
entry-pass));
+#endif
+ }
+#endif /* HAVE_MUNLOCK */
TALLOC_FREE(entry);
DEBUG(10,(remove_ccache_by_ccname: removed ccache
%s\n, ccname));
return NT_STATUS_OK;
@@ -227,9 +244,31 @@
new_entry-service = talloc_strdup(mem_ctx, service);
NT_STATUS_HAVE_NO_MEMORY(new_entry-service);
}
+
if (schedule_refresh_event pass) {
+#ifdef HAVE_MLOCK
+ size_t len = strlen(pass)+1;
+
+ new_entry-pass = TALLOC_ZERO(mem_ctx, len);
+ NT_STATUS_HAVE_NO_MEMORY(new_entry-pass);
+
+#ifdef DEBUG_PASSWORD
+ DEBUG(10,(mlocking memory: %p\n, new_entry-pass));
+#endif
+ if ((mlock(new_entry-pass, len)) == -1) {
+ DEBUG(0,(failed to mlock memory: %s (%d)\n,
+ strerror(errno), errno));
+ return map_nt_error_from_unix(errno);
+ }
+
+#ifdef DEBUG_PASSWORD
+ DEBUG(10,(mlocked memory: %p\n, new_entry-pass));
+#endif
+ memcpy(new_entry-pass, pass, len);
+#else
new_entry-pass = talloc_strdup(mem_ctx, pass);
NT_STATUS_HAVE_NO_MEMORY(new_entry-pass);
+#endif /* HAVE_MLOCK */
}
new_entry-create_time = create_time;
@@ -261,6 +300,13 @@
NTSTATUS destroy_ccache_list(void)
{
+#ifdef HAVE_MUNLOCKALL
+ if ((munlockall()) == -1) {
+ DEBUG(0,(failed to unlock memory: %s (%d)\n,
+ strerror(errno), errno));
+ return map_nt_error_from_unix(errno);
+ }
+#endif /* HAVE_MUNLOCKALL */
return talloc_destroy(mem_ctx) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
}
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_nss.h
svn commit: samba r15635 - branches/SAMBA_3_0/source/libads trunk/source/libads
Author: vlendec Date: 2006-05-16 15:14:39 + (Tue, 16 May 2006) New Revision: 15635 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=15635 Log: Fix a bogus gcc uninit variable message Modified: branches/SAMBA_3_0/source/libads/ldap.c trunk/source/libads/ldap.c Changeset: Modified: branches/SAMBA_3_0/source/libads/ldap.c === --- branches/SAMBA_3_0/source/libads/ldap.c 2006-05-16 14:29:39 UTC (rev 15634) +++ branches/SAMBA_3_0/source/libads/ldap.c 2006-05-16 15:14:39 UTC (rev 15635) @@ -2473,7 +2473,7 @@ BOOL ret = False; TALLOC_CTX *ctx = NULL; const char *gidnumber, *uidnumber, *homedir, *shell, *gecos; - char *schema_path; + char *schema_path = NULL; ADS_STRUCT *ads_s = ads; ADS_STATUS status; Modified: trunk/source/libads/ldap.c === --- trunk/source/libads/ldap.c 2006-05-16 14:29:39 UTC (rev 15634) +++ trunk/source/libads/ldap.c 2006-05-16 15:14:39 UTC (rev 15635) @@ -2473,7 +2473,7 @@ BOOL ret = False; TALLOC_CTX *ctx = NULL; const char *gidnumber, *uidnumber, *homedir, *shell, *gecos; - char *schema_path; + char *schema_path = NULL; ADS_STRUCT *ads_s = ads; ADS_STATUS status;
svn commit: samba r15636 - in branches/tmp/vl-posixacls: examples/misc packaging/RHEL packaging/RedHat-9 packaging/bin source source/auth source/client source/include source/lib source/libads source/l
Author: vlendec Date: 2006-05-16 15:45:14 + (Tue, 16 May 2006) New Revision: 15636 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=15636 Log: Merge -r15126:15635 Added: branches/tmp/vl-posixacls/source/include/ads_cldap.h branches/tmp/vl-posixacls/source/include/ads_dns.h branches/tmp/vl-posixacls/source/libads/cldap.c branches/tmp/vl-posixacls/source/libads/dns.c Removed: branches/tmp/vl-posixacls/source/auth/auth_rhosts.c branches/tmp/vl-posixacls/source/libads/ads_ldap.c branches/tmp/vl-posixacls/source/utils/net_ads_cldap.c Modified: branches/tmp/vl-posixacls/examples/misc/adssearch.pl branches/tmp/vl-posixacls/packaging/RHEL/makerpms.sh.tmpl branches/tmp/vl-posixacls/packaging/RHEL/samba.spec.tmpl branches/tmp/vl-posixacls/packaging/RedHat-9/makerpms.sh.tmpl branches/tmp/vl-posixacls/packaging/RedHat-9/samba.spec.tmpl branches/tmp/vl-posixacls/packaging/bin/update-pkginfo branches/tmp/vl-posixacls/source/Makefile.in branches/tmp/vl-posixacls/source/VERSION branches/tmp/vl-posixacls/source/aclocal.m4 branches/tmp/vl-posixacls/source/auth/auth.c branches/tmp/vl-posixacls/source/auth/auth_domain.c branches/tmp/vl-posixacls/source/auth/auth_ntlmssp.c branches/tmp/vl-posixacls/source/auth/auth_sam.c branches/tmp/vl-posixacls/source/auth/auth_script.c branches/tmp/vl-posixacls/source/auth/auth_util.c branches/tmp/vl-posixacls/source/auth/auth_winbind.c branches/tmp/vl-posixacls/source/client/clitar.c branches/tmp/vl-posixacls/source/client/smbctool.c branches/tmp/vl-posixacls/source/client/smbspool.c branches/tmp/vl-posixacls/source/configure.in branches/tmp/vl-posixacls/source/include/ads.h branches/tmp/vl-posixacls/source/include/auth.h branches/tmp/vl-posixacls/source/include/client.h branches/tmp/vl-posixacls/source/include/includes.h branches/tmp/vl-posixacls/source/include/messages.h branches/tmp/vl-posixacls/source/include/ntlmssp.h branches/tmp/vl-posixacls/source/include/rpc_samr.h branches/tmp/vl-posixacls/source/include/smb.h branches/tmp/vl-posixacls/source/include/smbprofile.h branches/tmp/vl-posixacls/source/lib/fault.c branches/tmp/vl-posixacls/source/lib/iconv.c branches/tmp/vl-posixacls/source/lib/smbldap.c branches/tmp/vl-posixacls/source/lib/substitute.c branches/tmp/vl-posixacls/source/lib/time.c branches/tmp/vl-posixacls/source/lib/util.c branches/tmp/vl-posixacls/source/lib/util_sid.c branches/tmp/vl-posixacls/source/lib/util_str.c branches/tmp/vl-posixacls/source/libads/ads_struct.c branches/tmp/vl-posixacls/source/libads/kerberos.c branches/tmp/vl-posixacls/source/libads/kerberos_keytab.c branches/tmp/vl-posixacls/source/libads/kerberos_verify.c branches/tmp/vl-posixacls/source/libads/krb5_errs.c branches/tmp/vl-posixacls/source/libads/krb5_setpw.c branches/tmp/vl-posixacls/source/libads/ldap.c branches/tmp/vl-posixacls/source/libads/ldap_utils.c branches/tmp/vl-posixacls/source/libads/sasl.c branches/tmp/vl-posixacls/source/libsmb/cliconnect.c branches/tmp/vl-posixacls/source/libsmb/clikrb5.c branches/tmp/vl-posixacls/source/libsmb/clireadwrite.c branches/tmp/vl-posixacls/source/libsmb/namequery.c branches/tmp/vl-posixacls/source/libsmb/nmblib.c branches/tmp/vl-posixacls/source/libsmb/ntlmssp.c branches/tmp/vl-posixacls/source/libsmb/samlogon_cache.c branches/tmp/vl-posixacls/source/locking/brlock.c branches/tmp/vl-posixacls/source/nmbd/nmbd_elections.c branches/tmp/vl-posixacls/source/nmbd/nmbd_incomingdgrams.c branches/tmp/vl-posixacls/source/nsswitch/pam_winbind.c branches/tmp/vl-posixacls/source/nsswitch/pam_winbind.h branches/tmp/vl-posixacls/source/nsswitch/wbinfo.c branches/tmp/vl-posixacls/source/nsswitch/winbind_nss_aix.c branches/tmp/vl-posixacls/source/nsswitch/winbind_nss_config.h branches/tmp/vl-posixacls/source/nsswitch/winbind_nss_irix.c branches/tmp/vl-posixacls/source/nsswitch/winbindd.c branches/tmp/vl-posixacls/source/nsswitch/winbindd.h branches/tmp/vl-posixacls/source/nsswitch/winbindd_ads.c branches/tmp/vl-posixacls/source/nsswitch/winbindd_cache.c branches/tmp/vl-posixacls/source/nsswitch/winbindd_cm.c branches/tmp/vl-posixacls/source/nsswitch/winbindd_cred_cache.c branches/tmp/vl-posixacls/source/nsswitch/winbindd_dual.c branches/tmp/vl-posixacls/source/nsswitch/winbindd_nss.h branches/tmp/vl-posixacls/source/nsswitch/winbindd_pam.c branches/tmp/vl-posixacls/source/nsswitch/winbindd_reconnect.c branches/tmp/vl-posixacls/source/nsswitch/winbindd_rpc.c branches/tmp/vl-posixacls/source/nsswitch/winbindd_util.c branches/tmp/vl-posixacls/source/pam_smbpass/general.h branches/tmp/vl-posixacls/source/pam_smbpass/support.c branches/tmp/vl-posixacls/source/param/loadparm.c branches/tmp/vl-posixacls/source/passdb/lookup_sid.c branches/tmp/vl-posixacls/source/passdb/passdb.c
svn commit: samba r15637 - in branches/tmp/trunk-libndr-unixinfo/source/lib: .
Author: vlendec
Date: 2006-05-16 16:07:41 + (Tue, 16 May 2006)
New Revision: 15637
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=15637
Log:
Ugly as hell and needs something better: Adapt the static SIDs to the new
representation in libndr/security.h.
Volker
Modified:
branches/tmp/trunk-libndr-unixinfo/source/lib/util_sid.c
Changeset:
Modified: branches/tmp/trunk-libndr-unixinfo/source/lib/util_sid.c
===
--- branches/tmp/trunk-libndr-unixinfo/source/lib/util_sid.c2006-05-16
15:45:14 UTC (rev 15636)
+++ branches/tmp/trunk-libndr-unixinfo/source/lib/util_sid.c2006-05-16
16:07:41 UTC (rev 15637)
@@ -30,57 +30,81 @@
*/
+static uint32_t global_sid_World_Domain_subauths[] =
{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
const DOM_SID global_sid_World_Domain = /* Everyone domain */
-{ 1, 0, {0,0,0,0,0,1}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}};
+{ 1, 0, {0,0,0,0,0,1}, global_sid_World_Domain_subauths };
+static uint32_t global_sid_World_subauths[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
const DOM_SID global_sid_World = /* Everyone */
-{ 1, 1, {0,0,0,0,0,1}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}};
+{ 1, 1, {0,0,0,0,0,1}, global_sid_World_subauths };
+static uint32_t global_sid_Creator_Owner_Domain_subauths[] =
{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
const DOM_SID global_sid_Creator_Owner_Domain = /* Creator Owner domain
*/
-{ 1, 0, {0,0,0,0,0,3}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}};
+{ 1, 0, {0,0,0,0,0,3}, global_sid_Creator_Owner_Domain_subauths };
+static uint32_t global_sid_NT_Authority_subauths[] =
{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
const DOM_SID global_sid_NT_Authority =/* NT Authority */
-{ 1, 0, {0,0,0,0,0,5}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}};
+{ 1, 0, {0,0,0,0,0,5}, global_sid_NT_Authority_subauths };
+static uint32_t global_sid_System_subauths[] =
{18,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
const DOM_SID global_sid_System = /* System */
-{ 1, 1, {0,0,0,0,0,5}, {18,0,0,0,0,0,0,0,0,0,0,0,0,0,0}};
+{ 1, 1, {0,0,0,0,0,5}, global_sid_System_subauths };
+static uint32_t global_sid_NULL_subauths[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
const DOM_SID global_sid_NULL =/* NULL sid */
-{ 1, 1, {0,0,0,0,0,0}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}};
+{ 1, 1, {0,0,0,0,0,0}, global_sid_NULL_subauths };
+static uint32_t global_sid_Authenticated_Users_subauths[] =
{11,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
const DOM_SID global_sid_Authenticated_Users = /* All authenticated rids */
-{ 1, 1, {0,0,0,0,0,5}, {11,0,0,0,0,0,0,0,0,0,0,0,0,0,0}};
+{ 1, 1, {0,0,0,0,0,5}, global_sid_Authenticated_Users_subauths };
+static uint32_t global_sid_Network_subauths[] =
{2,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
const DOM_SID global_sid_Network = /* Network rids */
-{ 1, 1, {0,0,0,0,0,5}, {2,0,0,0,0,0,0,0,0,0,0,0,0,0,0}};
+{ 1, 1, {0,0,0,0,0,5}, global_sid_Network_subauths };
+static uint32_t global_sid_Creator_Owner_subauths[] =
{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
const DOM_SID global_sid_Creator_Owner = /* Creator Owner */
-{ 1, 1, {0,0,0,0,0,3}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}};
+{ 1, 1, {0,0,0,0,0,3}, global_sid_Creator_Owner_subauths };
+static uint32_t global_sid_Creator_Group_subauths[] =
{1,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
const DOM_SID global_sid_Creator_Group = /* Creator Group */
-{ 1, 1, {0,0,0,0,0,3}, {1,0,0,0,0,0,0,0,0,0,0,0,0,0,0}};
+{ 1, 1, {0,0,0,0,0,3}, global_sid_Creator_Group_subauths };
+static uint32_t global_sid_Anonymous_subauths[] =
{7,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
const DOM_SID global_sid_Anonymous = /* Anonymous login */
-{ 1, 1, {0,0,0,0,0,5}, {7,0,0,0,0,0,0,0,0,0,0,0,0,0,0}};
+{ 1, 1, {0,0,0,0,0,5}, global_sid_Anonymous_subauths };
+static uint32_t global_sid_Builtin_subauths[] =
{32,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
const DOM_SID global_sid_Builtin = /* Local well-known
domain */
-{ 1, 1, {0,0,0,0,0,5}, {32,0,0,0,0,0,0,0,0,0,0,0,0,0,0}};
+{ 1, 1, {0,0,0,0,0,5}, global_sid_Builtin_subauths };
+static uint32_t global_sid_Builtin_Administrators_subauths[] =
{32,544,0,0,0,0,0,0,0,0,0,0,0,0,0};
const DOM_SID global_sid_Builtin_Administrators = /* Builtin
administrators */
-{ 1, 2, {0,0,0,0,0,5}, {32,544,0,0,0,0,0,0,0,0,0,0,0,0,0}};
+{ 1, 2, {0,0,0,0,0,5}, global_sid_Builtin_Administrators_subauths };
+static uint32_t global_sid_Builtin_Users_subauths[] =
{32,545,0,0,0,0,0,0,0,0,0,0,0,0,0};
const DOM_SID global_sid_Builtin_Users = /* Builtin users */
-{ 1, 2, {0,0,0,0,0,5}, {32,545,0,0,0,0,0,0,0,0,0,0,0,0,0}};
+{ 1, 2, {0,0,0,0,0,5}, global_sid_Builtin_Users_subauths };
+static uint32_t global_sid_Builtin_Guests_subauths[] =
{32,546,0,0,0,0,0,0,0,0,0,0,0,0,0};
const DOM_SID global_sid_Builtin_Guests = /* Builtin guest users
*/
-{ 1, 2, {0,0,0,0,0,5}, {32,546,0,0,0,0,0,0,0,0,0,0,0,0,0}};
+{ 1, 2, {0,0,0,0,0,5},
svn commit: samba r15638 - in branches/SAMBA_4_0/source/libcli/raw: .
Author: metze
Date: 2006-05-16 16:28:36 + (Tue, 16 May 2006)
New Revision: 15638
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=15638
Log:
add a usefull macro to get a pointer the smb_handle union
of smb_open, as it's not nicely alligned for all levels,
If someone has an idea for a better solution where we can access
it via op-generic.out.file.* please let me know:-)
metze
Modified:
branches/SAMBA_4_0/source/libcli/raw/interfaces.h
Changeset:
Modified: branches/SAMBA_4_0/source/libcli/raw/interfaces.h
===
--- branches/SAMBA_4_0/source/libcli/raw/interfaces.h 2006-05-16 16:07:41 UTC
(rev 15637)
+++ branches/SAMBA_4_0/source/libcli/raw/interfaces.h 2006-05-16 16:28:36 UTC
(rev 15638)
@@ -1173,6 +1173,48 @@
/* union for open() backend call */
union smb_open {
+/*
+ * because the *.out.file structs are not aligned to the same offset for each
level
+ * we provide a hepler macro that should be used to find the current
smb_handle structure
+ */
+#define SMB_OPEN_OUT_FILE(op, file) do { \
+ switch (op-generic.level) { \
+ case RAW_OPEN_OPEN: \
+ file = op-openold.out.file; \
+ break; \
+ case RAW_OPEN_OPENX: \
+ file = op-openx.out.file; \
+ break; \
+ case RAW_OPEN_MKNEW: \
+ file = op-mknew.out.file; \
+ break; \
+ case RAW_OPEN_CREATE: \
+ file = op-create.out.file; \
+ break; \
+ case RAW_OPEN_CTEMP: \
+ file = op-ctemp.out.file; \
+ break; \
+ case RAW_OPEN_SPLOPEN: \
+ file = op-splopen.out.file; \
+ break; \
+ case RAW_OPEN_NTCREATEX: \
+ file = op-ntcreatex.out.file; \
+ break; \
+ case RAW_OPEN_T2OPEN: \
+ file = op-t2open.out.file; \
+ break; \
+ case RAW_OPEN_NTTRANS_CREATE: \
+ file = op-nttrans.out.file; \
+ break; \
+ case RAW_OPEN_OPENX_READX: \
+ file = op-openxreadx.out.file; \
+ break; \
+ default: \
+ /* this must be a programmer error */ \
+ file = NULL; \
+ break; \
+ } \
+} while (0)
/* SMBNTCreateX interface */
struct {
enum smb_open_level level;
@@ -1212,7 +1254,7 @@
uint16_t ipc_state;
uint8_t is_directory;
} out;
- } ntcreatex, generic;
+ } ntcreatex, nttrans, generic;
/* TRANS2_OPEN interface */
struct {
svn commit: samba r15639 - in branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules: .
Author: metze
Date: 2006-05-16 16:43:34 + (Tue, 16 May 2006)
New Revision: 15639
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=15639
Log:
fix warnings
metze
Modified:
branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/objectguid.c
branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/samldb.c
Changeset:
Modified: branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/objectguid.c
===
--- branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/objectguid.c
2006-05-16 16:28:36 UTC (rev 15638)
+++ branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/objectguid.c
2006-05-16 16:43:34 UTC (rev 15639)
@@ -53,7 +53,7 @@
/* add_record: add objectGUID attribute */
static int objectguid_add(struct ldb_module *module, struct ldb_request *req)
{
- const struct ldb_message *msg = req-op.add.message;
+ struct ldb_message *msg = req-op.add.message;
struct ldb_val v;
struct ldb_message *msg2;
struct ldb_message_element *attribute;
Modified: branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/samldb.c
===
--- branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/samldb.c 2006-05-16
16:28:36 UTC (rev 15638)
+++ branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/samldb.c 2006-05-16
16:43:34 UTC (rev 15639)
@@ -751,7 +751,7 @@
/* add_record */
static int samldb_add(struct ldb_module *module, struct ldb_request *req)
{
- const struct ldb_message *msg = req-op.add.message;
+ struct ldb_message *msg = req-op.add.message;
struct ldb_message *msg2 = NULL;
int ret;
svn commit: samba r15640 - in branches/SAMBA_4_0/source: libcli/raw smb_server/smb torture/raw
Author: metze
Date: 2006-05-16 16:50:50 + (Tue, 16 May 2006)
New Revision: 15640
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=15640
Log:
- NT IOCTL calls also have an 'in' data_blob
- fix the receive code of NT IOCTL's we only need the NTTRANS data payload
not the SMB payload here
metze
Modified:
branches/SAMBA_4_0/source/libcli/raw/interfaces.h
branches/SAMBA_4_0/source/libcli/raw/rawioctl.c
branches/SAMBA_4_0/source/smb_server/smb/nttrans.c
branches/SAMBA_4_0/source/torture/raw/ioctl.c
Changeset:
Modified: branches/SAMBA_4_0/source/libcli/raw/interfaces.h
===
--- branches/SAMBA_4_0/source/libcli/raw/interfaces.h 2006-05-16 16:43:34 UTC
(rev 15639)
+++ branches/SAMBA_4_0/source/libcli/raw/interfaces.h 2006-05-16 16:50:50 UTC
(rev 15640)
@@ -1716,6 +1716,7 @@
uint32_t function;
BOOL fsctl;
uint8_t filter;
+ DATA_BLOB blob;
} in;
struct {
DATA_BLOB blob;
Modified: branches/SAMBA_4_0/source/libcli/raw/rawioctl.c
===
--- branches/SAMBA_4_0/source/libcli/raw/rawioctl.c 2006-05-16 16:43:34 UTC
(rev 15639)
+++ branches/SAMBA_4_0/source/libcli/raw/rawioctl.c 2006-05-16 16:50:50 UTC
(rev 15640)
@@ -86,7 +86,7 @@
SCVAL(setup, 7, parms-ntioctl.in.filter);
nt.in.function = NT_TRANSACT_IOCTL;
nt.in.params = data_blob(NULL, 0);
- nt.in.data = data_blob(NULL, 0);
+ nt.in.data = parms-ntioctl.in.blob;
return smb_raw_nttrans_send(tree, nt);
}
@@ -98,13 +98,22 @@
TALLOC_CTX *mem_ctx,
union smb_ioctl *parms)
{
- if (!smbcli_request_receive(req) ||
- smbcli_request_is_error(req)) {
- return smbcli_request_destroy(req);
- }
+ NTSTATUS status;
+ struct smb_nttrans nt;
+ TALLOC_CTX *tmp_mem;
- parms-ntioctl.out.blob = smbcli_req_pull_blob(req, mem_ctx,
req-in.data, -1);
- return smbcli_request_destroy(req);
+ tmp_mem = talloc_new(mem_ctx);
+ NT_STATUS_HAVE_NO_MEMORY(tmp_mem);
+
+ status = smb_raw_nttrans_recv(req, tmp_mem, nt);
+ if (!NT_STATUS_IS_OK(status)) goto fail;
+
+ parms-ntioctl.out.blob = nt.out.data;
+ talloc_steal(mem_ctx, parms-ntioctl.out.blob.data);
+
+fail:
+ talloc_free(tmp_mem);
+ return status;
}
Modified: branches/SAMBA_4_0/source/smb_server/smb/nttrans.c
===
--- branches/SAMBA_4_0/source/smb_server/smb/nttrans.c 2006-05-16 16:43:34 UTC
(rev 15639)
+++ branches/SAMBA_4_0/source/smb_server/smb/nttrans.c 2006-05-16 16:50:50 UTC
(rev 15640)
@@ -304,7 +304,6 @@
uint16_t fnum;
uint8_t filter;
BOOL fsctl;
- DATA_BLOB *blob;
NTSTATUS status;
/* should have at least 4 setup words */
@@ -320,13 +319,12 @@
fsctl = CVAL(trans-in.setup, 6);
filter = CVAL(trans-in.setup, 7);
- blob = trans-in.data;
-
nt-ntioctl.level = RAW_IOCTL_NTIOCTL;
nt-ntioctl.in.file.fnum = fnum;
nt-ntioctl.in.function = function;
nt-ntioctl.in.fsctl = fsctl;
nt-ntioctl.in.filter = filter;
+ nt-ntioctl.in.blob = trans-in.data;
status = nttrans_setup_reply(op, trans, 0, 0, 1);
NT_STATUS_NOT_OK_RETURN(status);
Modified: branches/SAMBA_4_0/source/torture/raw/ioctl.c
===
--- branches/SAMBA_4_0/source/torture/raw/ioctl.c 2006-05-16 16:43:34 UTC
(rev 15639)
+++ branches/SAMBA_4_0/source/torture/raw/ioctl.c 2006-05-16 16:50:50 UTC
(rev 15640)
@@ -105,6 +105,7 @@
nt.ntioctl.in.file.fnum = fnum;
nt.ntioctl.in.fsctl = True;
nt.ntioctl.in.filter = 0;
+ nt.ntioctl.in.blob = data_blob(NULL, 0);
status = smb_raw_ioctl(cli-tree, mem_ctx, nt);
CHECK_STATUS(status, NT_STATUS_OK);
@@ -115,6 +116,7 @@
nt.ntioctl.in.file.fnum = fnum;
nt.ntioctl.in.fsctl = True;
nt.ntioctl.in.filter = 0;
+ nt.ntioctl.in.blob = data_blob(NULL, 0);
status = smb_raw_ioctl(cli-tree, mem_ctx, nt);
if (NT_STATUS_IS_OK(status)) {
svn commit: samba r15641 - in branches/SAMBA_4_0/source: .
Author: metze Date: 2006-05-16 16:51:34 + (Tue, 16 May 2006) New Revision: 15641 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=15641 Log: we know have source/version.h metze Modified: branches/SAMBA_4_0/source/main.mk Changeset: Modified: branches/SAMBA_4_0/source/main.mk === --- branches/SAMBA_4_0/source/main.mk 2006-05-16 16:50:50 UTC (rev 15640) +++ branches/SAMBA_4_0/source/main.mk 2006-05-16 16:51:34 UTC (rev 15641) @@ -34,8 +34,8 @@ include passdb/config.mk DEFAULT_HEADERS = $(srcdir)/include/core.h \ - $(srcdir)/include/dlinklist.h \ - $(srcdir)/version.h + $(srcdir)/include/dlinklist.h \ + $(srcdir)/version.h binaries: $(BINARIES) libraries: $(STATIC_LIBS) $(SHARED_LIBS) @@ -258,7 +258,7 @@ realdistclean: distclean removebackup -rm -f include/config_tmp.h.in - -rm -f include/version.h + -rm -f version.h -rm -f configure -rm -f $(MANPAGES)
svn commit: samba r15643 - in branches/SAMBA_4_0/source/libcli/raw: .
Author: metze Date: 2006-05-16 16:59:08 + (Tue, 16 May 2006) New Revision: 15643 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=15643 Log: add some FSCTL_ codes metze Modified: branches/SAMBA_4_0/source/libcli/raw/ioctl.h Changeset: Modified: branches/SAMBA_4_0/source/libcli/raw/ioctl.h === --- branches/SAMBA_4_0/source/libcli/raw/ioctl.h2006-05-16 16:57:56 UTC (rev 15642) +++ branches/SAMBA_4_0/source/libcli/raw/ioctl.h2006-05-16 16:59:08 UTC (rev 15643) @@ -25,9 +25,36 @@ /* filesystem control codes */ -#define FSCTL_FILESYSTEM 0x9 -#define FSCTL_SET_SPARSE (FSCTL_FILESYSTEM | (492)) -#define FSCTL_REQUEST_BATCH_OPLOCK (FSCTL_FILESYSTEM | (22)) +#define FSCTL_METHOD_BUFFERED 0x +#define FSCTL_METHOD_IN_DIRECT 0x0001 +#define FSCTL_METHOD_OUT_DIRECT0x0002 +#define FSCTL_METHOD_NEITHER 0x0003 -#define FSCTL_NAMED_PIPE 0x11 -#define FSCTL_NAMED_PIPE_READ_WRITE (FSCTL_NAMED_PIPE | 0xc017) +#define FSCTL_ACCESS_ANY 0x +#define FSCTL_ACCESS_READ 0x4000 +#define FSCTL_ACCESS_WRITE 0x8000 + +#define FSCTL_FILESYSTEM 0x0009 +#define FSCTL_REQUEST_OPLOCK_LEVEL_1(FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x | FSCTL_METHOD_BUFFERED) +#define FSCTL_REQUEST_OPLOCK_LEVEL_2(FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x0004 | FSCTL_METHOD_BUFFERED) +#define FSCTL_REQUEST_BATCH_OPLOCK (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x0008 | FSCTL_METHOD_BUFFERED) +#define FSCTL_OPLOCK_BREAK_ACKNOWLEDGE (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x000C | FSCTL_METHOD_BUFFERED) +#define FSCTL_OPBATCH_ACK_CLOSE_PENDING (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x0010 | FSCTL_METHOD_BUFFERED) +#define FSCTL_OPLOCK_BREAK_NOTIFY (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x0014 | FSCTL_METHOD_BUFFERED) +#define FSCTL_FILESYS_GET_STATISTICS (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x0060 | FSCTL_METHOD_BUFFERED) +#define FSCTL_GET_NTFS_VOLUME_DATA (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x0064 | FSCTL_METHOD_BUFFERED) +#define FSCTL_FIND_FILES_BY_SID(FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x008C | FSCTL_METHOD_NEITHER) +#define FSCTL_SET_OBJECT_ID(FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x0098 | FSCTL_METHOD_BUFFERED) +#define FSCTL_GET_OBJECT_ID(FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x009C | FSCTL_METHOD_BUFFERED) +#define FSCTL_DELETE_OBJECT_ID (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x00A0 | FSCTL_METHOD_BUFFERED) +#define FSCTL_SET_REPARSE_POINT(FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x00A4 | FSCTL_METHOD_BUFFERED) +#define FSCTL_GET_REPARSE_POINT(FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x00A8 | FSCTL_METHOD_BUFFERED) +#define FSCTL_DELETE_REPARSE_POINT (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x00AC | FSCTL_METHOD_BUFFERED) +#define FSCTL_CREATE_OR_GET_OBJECT_ID (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x00C0 | FSCTL_METHOD_BUFFERED) +#define FSCTL_SET_SPARSE (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x00C4 | FSCTL_METHOD_BUFFERED) + +#define FSCTL_NAMED_PIPE 0x0011 +#define FSCTL_NAMED_PIPE_READ_WRITE(FSCTL_NAMED_PIPE | FSCTL_ACCESS_ANY | 0xC014 | FSCTL_METHOD_NEITHER) + +#define FSCTL_NETWORK_FILESYSTEM 0x0014 +#define FSCTL_GET_SHADOW_COPY_DATA (FSCTL_NETWORK_FILESYSTEM | FSCTL_ACCESS_READ | 0x0064 | FSCTL_METHOD_BUFFERED)
