[Samba] A wide choice of programs for MAC and PC.
http://cpGq.werhlksdhb.info/?MviROxgqlQn9yggUOjm -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] User in passdb, but getpwnam() fails!
Adi Nugraha wrote: I'm using Mandrake 10.0, the nsswitch.conf file is already configured, and from getent passwd, i can see the user name that I'm using, BTW I tried to reconfigure everything from the begining again, and now I can login using the root password, but stilll not as a Domain user, still the same problem getpwnam() fails, did you configure ldap auth using drakauth or manually? if manually, try to do it again using drakauth. Tomek -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] About access the samba server through VPN connection
John Wong wrote: Is there any restriction for access the samba server through the VPN connection. We are trying to do the remote access the samba server through the VPN client. And the VPN server isn't apply any rule for blocking any service. Any suggestion we can do??? We are facing the problem for accessing the samba server through the VPN connection. How's the VPN done? And also using the samba-2.2.3a-6 with the Red Hat Linux 7.3 (Kernel 2.4.18-3). Really old version. You should upgrade. that's one. second, you didn't really specify what kind of a problem you have. maybe you need to configure samba to be a wins server, and the client to use samba wins server, as the vpn clients are on another network? Tomek -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
svn commit: samba r4817 - in branches/SAMBA_4_0/source: client include lib lib/cmdline libads param smbd
Author: tridge Date: 2005-01-18 09:30:43 + (Tue, 18 Jan 2005) New Revision: 4817 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=4817 Log: ccache was being made ineffective on all the build farm machines because the version number was being auto-updated and included in all C files. With this change it is only included where needed. Modified: branches/SAMBA_4_0/source/client/client.c branches/SAMBA_4_0/source/include/includes.h branches/SAMBA_4_0/source/lib/cmdline/popt_common.c branches/SAMBA_4_0/source/lib/fault.c branches/SAMBA_4_0/source/libads/ldap.c branches/SAMBA_4_0/source/param/loadparm.c branches/SAMBA_4_0/source/smbd/process_thread.c Changeset: Modified: branches/SAMBA_4_0/source/client/client.c === --- branches/SAMBA_4_0/source/client/client.c 2005-01-18 06:38:11 UTC (rev 4816) +++ branches/SAMBA_4_0/source/client/client.c 2005-01-18 09:30:43 UTC (rev 4817) @@ -22,6 +22,7 @@ */ #include includes.h +#include version.h #include dynconfig.h #include clilist.h #include lib/cmdline/popt_common.h Modified: branches/SAMBA_4_0/source/include/includes.h === --- branches/SAMBA_4_0/source/include/includes.h2005-01-18 06:38:11 UTC (rev 4816) +++ branches/SAMBA_4_0/source/include/includes.h2005-01-18 09:30:43 UTC (rev 4817) @@ -152,7 +152,6 @@ #endif /* Lists, trees, caching, database... */ -#include version.h #include xfile.h #define TALLOC_DEPRECATED 1 #include lib/talloc/talloc.h Modified: branches/SAMBA_4_0/source/lib/cmdline/popt_common.c === --- branches/SAMBA_4_0/source/lib/cmdline/popt_common.c 2005-01-18 06:38:11 UTC (rev 4816) +++ branches/SAMBA_4_0/source/lib/cmdline/popt_common.c 2005-01-18 09:30:43 UTC (rev 4817) @@ -21,6 +21,7 @@ */ #include includes.h +#include version.h #include dynconfig.h #include system/passwd.h #include lib/cmdline/popt_common.h Modified: branches/SAMBA_4_0/source/lib/fault.c === --- branches/SAMBA_4_0/source/lib/fault.c 2005-01-18 06:38:11 UTC (rev 4816) +++ branches/SAMBA_4_0/source/lib/fault.c 2005-01-18 09:30:43 UTC (rev 4817) @@ -19,6 +19,7 @@ */ #include includes.h +#include version.h #include system/wait.h static void (*cont_fn)(void *); Modified: branches/SAMBA_4_0/source/libads/ldap.c === --- branches/SAMBA_4_0/source/libads/ldap.c 2005-01-18 06:38:11 UTC (rev 4816) +++ branches/SAMBA_4_0/source/libads/ldap.c 2005-01-18 09:30:43 UTC (rev 4817) @@ -21,6 +21,7 @@ */ #include includes.h +#include version.h #ifdef HAVE_LDAP Modified: branches/SAMBA_4_0/source/param/loadparm.c === --- branches/SAMBA_4_0/source/param/loadparm.c 2005-01-18 06:38:11 UTC (rev 4816) +++ branches/SAMBA_4_0/source/param/loadparm.c 2005-01-18 09:30:43 UTC (rev 4817) @@ -53,6 +53,7 @@ */ #include includes.h +#include version.h #include dynconfig.h #include system/time.h #include system/iconv.h Modified: branches/SAMBA_4_0/source/smbd/process_thread.c === --- branches/SAMBA_4_0/source/smbd/process_thread.c 2005-01-18 06:38:11 UTC (rev 4816) +++ branches/SAMBA_4_0/source/smbd/process_thread.c 2005-01-18 09:30:43 UTC (rev 4817) @@ -21,6 +21,7 @@ */ #include includes.h +#include version.h #include pthread.h #ifdef HAVE_BACKTRACE #include execinfo.h
svn commit: samba r4818 - in branches/SAMBA_4_0/source/lib: .
Author: tridge
Date: 2005-01-18 10:06:37 + (Tue, 18 Jan 2005)
New Revision: 4818
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=4818
Log:
missed version.h here
Modified:
branches/SAMBA_4_0/source/lib/version.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/version.c
===
--- branches/SAMBA_4_0/source/lib/version.c 2005-01-18 09:30:43 UTC (rev
4817)
+++ branches/SAMBA_4_0/source/lib/version.c 2005-01-18 10:06:37 UTC (rev
4818)
@@ -20,6 +20,7 @@
*/
#include includes.h
+#include version.h
const char *samba_version_string(void)
{
svn commit: samba r4819 - in branches/SAMBA_4_0/source: smb_server smbd
Author: tridge Date: 2005-01-18 10:10:35 + (Tue, 18 Jan 2005) New Revision: 4819 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=4819 Log: its just not my day today Modified: branches/SAMBA_4_0/source/smb_server/sesssetup.c branches/SAMBA_4_0/source/smbd/server.c Changeset: Modified: branches/SAMBA_4_0/source/smb_server/sesssetup.c === --- branches/SAMBA_4_0/source/smb_server/sesssetup.c2005-01-18 10:06:37 UTC (rev 4818) +++ branches/SAMBA_4_0/source/smb_server/sesssetup.c2005-01-18 10:10:35 UTC (rev 4819) @@ -22,6 +22,7 @@ */ #include includes.h +#include version.h #include auth/auth.h #include smb_server/smb_server.h Modified: branches/SAMBA_4_0/source/smbd/server.c === --- branches/SAMBA_4_0/source/smbd/server.c 2005-01-18 10:06:37 UTC (rev 4818) +++ branches/SAMBA_4_0/source/smbd/server.c 2005-01-18 10:10:35 UTC (rev 4819) @@ -22,6 +22,7 @@ */ #include includes.h +#include version.h #include lib/cmdline/popt_common.h /
svn commit: samba r4820 - in branches/SAMBA_3_0/source: . utils
Author: jerry
Date: 2005-01-18 14:46:24 + (Tue, 18 Jan 2005)
New Revision: 4820
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=4820
Log:
add beginnings of 'net rpc rights' for managing privilege assignments
Added:
branches/SAMBA_3_0/source/utils/net_rpc_rights.c
Modified:
branches/SAMBA_3_0/source/Makefile.in
branches/SAMBA_3_0/source/utils/net.h
branches/SAMBA_3_0/source/utils/net_rpc.c
Changeset:
Modified: branches/SAMBA_3_0/source/Makefile.in
===
--- branches/SAMBA_3_0/source/Makefile.in 2005-01-18 10:10:35 UTC (rev
4819)
+++ branches/SAMBA_3_0/source/Makefile.in 2005-01-18 14:46:24 UTC (rev
4820)
@@ -532,7 +532,7 @@
utils/net_rap.o utils/net_rpc.o utils/net_rpc_samsync.o \
utils/net_rpc_join.o utils/net_time.o utils/net_lookup.o \
utils/net_cache.o utils/net_groupmap.o utils/net_idmap.o \
- utils/net_status.o utils/net_rpc_printer.o
+ utils/net_status.o utils/net_rpc_printer.o utils/net_rpc_rights.o
NET_OBJ = $(NET_OBJ1) $(PARAM_OBJ) $(SECRETS_OBJ) $(LIBSMB_OBJ) \
$(RPC_PARSE_OBJ) $(PASSDB_OBJ) $(GROUPDB_OBJ) \
Modified: branches/SAMBA_3_0/source/utils/net.h
===
--- branches/SAMBA_3_0/source/utils/net.h 2005-01-18 10:10:35 UTC (rev
4819)
+++ branches/SAMBA_3_0/source/utils/net.h 2005-01-18 14:46:24 UTC (rev
4820)
@@ -17,8 +17,21 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
+/*
+ * A function of this type is passed to the '
+ * run_rpc_command' wrapper. Must go before the net_proto.h
+ * include
+ */
+
+typedef NTSTATUS (*rpc_command_fn)(const DOM_SID *, const char *,
+ struct cli_state *, TALLOC_CTX *, int, const
char **);
+
+/* INCLUDE FILES */
+
#include utils/net_proto.h
+/* MACROS DEFINES */
+
#define NET_FLAGS_MASTER 1
#define NET_FLAGS_DMB 2
Modified: branches/SAMBA_3_0/source/utils/net_rpc.c
===
--- branches/SAMBA_3_0/source/utils/net_rpc.c 2005-01-18 10:10:35 UTC (rev
4819)
+++ branches/SAMBA_3_0/source/utils/net_rpc.c 2005-01-18 14:46:24 UTC (rev
4820)
@@ -37,10 +37,6 @@
**/
-/* A function of this type is passed to the 'run_rpc_command' wrapper */
-typedef NTSTATUS (*rpc_command_fn)(const DOM_SID *, const char *,
- struct cli_state *, TALLOC_CTX *, int, const
char **);
-
/**
* Many of the RPC functions need the domain sid. This function gets
* it at the start of every run
@@ -100,7 +96,7 @@
* @return A shell status integer (0 for success)
*/
-static int run_rpc_command(struct cli_state *cli_arg, const int pipe_idx, int
conn_flags,
+int run_rpc_command(struct cli_state *cli_arg, const int pipe_idx, int
conn_flags,
rpc_command_fn fn,
int argc, const char **argv)
{
@@ -5260,10 +5256,10 @@
d_printf( net rpc getsid \t\tfetch the domain sid into the local
secrets.tdb\n);
d_printf( net rpc vampire \t\tsyncronise an NT PDC's users and groups
into the local passdb\n);
d_printf( net rpc samdump \t\tdiplay an NT PDC's users, groups and
other data\n);
- d_printf( net rpc trustdom \t\tto create trusting domain's account\n
-\t\t\t\t\tor establish trust\n);
+ d_printf( net rpc trustdom \t\tto create trusting domain's account or
establish trust\n);
d_printf( net rpc abortshutdown \tto abort the shutdown of a remote
server\n);
d_printf( net rpc shutdown \t\tto shutdown a remote server\n);
+ d_printf( net rpc rights\t\tto manage privileges assigned to SIDs\n);
d_printf(\n);
d_printf('net rpc shutdown' also accepts the following miscellaneous
options:\n); /* misc options */
d_printf(\t-r or --reboot\trequest remote server reboot on
shutdown\n);
@@ -5332,6 +5328,7 @@
{samdump, rpc_samdump},
{vampire, rpc_vampire},
{getsid, net_rpc_getsid},
+ {rights, net_rpc_rights},
{help, net_rpc_help},
{NULL, NULL}
};
Added: branches/SAMBA_3_0/source/utils/net_rpc_rights.c
===
--- branches/SAMBA_3_0/source/utils/net_rpc_rights.c2005-01-18 10:10:35 UTC
(rev 4819)
+++ branches/SAMBA_3_0/source/utils/net_rpc_rights.c2005-01-18 14:46:24 UTC
(rev 4820)
@@ -0,0 +1,116 @@
+/*
+ Samba Unix/Linux SMB client library
+ Distributed SMB/CIFS Server Management Utility
+ Copyright (C) Gerald (Jerry) Carter 2004
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General
svn commit: samba r4821 - in branches/SAMBA_3_0/source: . rpc_client rpcclient utils
Author: jerry Date: 2005-01-18 18:28:34 + (Tue, 18 Jan 2005) New Revision: 4821 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=4821 Log: finish off 'net rpc rights [list|grant|revoke]' one small todo item is to add a 'accounts' sub option to 'net rpc list' so enumerate all privileged SIDs and their associated rights. Modified: branches/SAMBA_3_0/source/Makefile.in branches/SAMBA_3_0/source/rpc_client/cli_lsarpc.c branches/SAMBA_3_0/source/rpcclient/cmd_lsarpc.c branches/SAMBA_3_0/source/utils/net_rpc_rights.c Changeset: Sorry, the patch is too large (564 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=4821
svn commit: samba r4822 - in branches/SAMBA_3_0/source: lib rpc_server
Author: jerry
Date: 2005-01-18 18:29:28 + (Tue, 18 Jan 2005)
New Revision: 4822
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=4822
Log:
fix return code when you ask for a non-privileged SID via one of the privileges
RPC calls
Modified:
branches/SAMBA_3_0/source/lib/privileges.c
branches/SAMBA_3_0/source/rpc_server/srv_lsa_nt.c
Changeset:
Modified: branches/SAMBA_3_0/source/lib/privileges.c
===
--- branches/SAMBA_3_0/source/lib/privileges.c 2005-01-18 18:28:34 UTC (rev
4821)
+++ branches/SAMBA_3_0/source/lib/privileges.c 2005-01-18 18:29:28 UTC (rev
4822)
@@ -739,3 +739,12 @@
return True;
}
+/***
+***/
+
+BOOL is_privileged_sid( DOM_SID *sid )
+{
+ SE_PRIV mask;
+
+ return get_privileges( sid, mask );
+}
Modified: branches/SAMBA_3_0/source/rpc_server/srv_lsa_nt.c
===
--- branches/SAMBA_3_0/source/rpc_server/srv_lsa_nt.c 2005-01-18 18:28:34 UTC
(rev 4821)
+++ branches/SAMBA_3_0/source/rpc_server/srv_lsa_nt.c 2005-01-18 18:29:28 UTC
(rev 4822)
@@ -967,6 +967,9 @@
if ( !nt_token_check_domain_rid( p-pipe_user.nt_user_token,
DOMAIN_GROUP_RID_ADMINS ) )
return NT_STATUS_ACCESS_DENIED;
+
+ if ( is_privileged_sid( info-sid ) )
+ return NT_STATUS_OBJECT_NAME_COLLISION;
/* associate the user/group SID with the (unique) handle. */
svn commit: samba r4823 - in branches/SAMBA_3_0/source: .
Author: jerry
Date: 2005-01-18 18:29:55 + (Tue, 18 Jan 2005)
New Revision: 4823
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=4823
Log:
remove -O1 from --with-developer
Modified:
branches/SAMBA_3_0/source/configure.in
Changeset:
Modified: branches/SAMBA_3_0/source/configure.in
===
--- branches/SAMBA_3_0/source/configure.in 2005-01-18 18:29:28 UTC (rev
4822)
+++ branches/SAMBA_3_0/source/configure.in 2005-01-18 18:29:55 UTC (rev
4823)
@@ -238,7 +238,7 @@
AC_ARG_ENABLE(developer, [ --enable-developer Turn on developer warnings
and debugging (default=no)],
[if eval test x$enable_developer = xyes; then
developer=yes
- CFLAGS=${CFLAGS} -gstabs -Wall -Wshadow -Wstrict-prototypes
-Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -DDEBUG_PASSWORD
-DDEVELOPER -O1
+ CFLAGS=${CFLAGS} -gstabs -Wall -Wshadow -Wstrict-prototypes
-Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -DDEBUG_PASSWORD
-DDEVELOPER
fi])
AC_ARG_ENABLE(krb5developer, [ --enable-krb5developer Turn on developer
warnings and debugging, except -Wstrict-prototypes (default=no)],
svn commit: samba r4824 - in branches/SAMBA_3_0/source/rpc_server: .
Author: jerry
Date: 2005-01-18 18:30:32 + (Tue, 18 Jan 2005)
New Revision: 4824
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=4824
Log:
wrap the shutdown and abort_shutdown calls in check for the SE_REMOTE_SHUTDOWN
privilege
Modified:
branches/SAMBA_3_0/source/rpc_server/srv_reg_nt.c
Changeset:
Modified: branches/SAMBA_3_0/source/rpc_server/srv_reg_nt.c
===
--- branches/SAMBA_3_0/source/rpc_server/srv_reg_nt.c 2005-01-18 18:29:55 UTC
(rev 4823)
+++ branches/SAMBA_3_0/source/rpc_server/srv_reg_nt.c 2005-01-18 18:30:32 UTC
(rev 4824)
@@ -604,7 +604,7 @@
/* message */
rpcstr_pull (message, unimsg.buffer, sizeof(message),
unimsg.uni_str_len*2,0);
- /* security check */
+ /* security check */
alpha_strcpy (chkmsg, message, NULL, sizeof(message));
/* timeout */
fstr_sprintf(timeout, %d, q_u-timeout);
@@ -617,12 +617,23 @@
if(*shutdown_script) {
int shutdown_ret;
+ SE_PRIV se_shutdown = SE_REMOTE_SHUTDOWN;
+ BOOL can_shutdown;
+
+ can_shutdown = user_has_privileges( p-pipe_user.nt_user_token,
se_shutdown );
+
+ /** BEGIN SeRemoteShutdownPrivilege BLOCK **/
+ if ( can_shutdown )
+ become_root();
all_string_sub(shutdown_script, %m, chkmsg,
sizeof(shutdown_script));
all_string_sub(shutdown_script, %t, timeout,
sizeof(shutdown_script));
all_string_sub(shutdown_script, %r, r,
sizeof(shutdown_script));
all_string_sub(shutdown_script, %f, f,
sizeof(shutdown_script));
shutdown_ret = smbrun(shutdown_script,NULL);
DEBUG(3,(_reg_shutdown: Running the command `%s' gave
%d\n,shutdown_script,shutdown_ret));
+ if ( can_shutdown )
+ unbecome_root();
+ /** END SeRemoteShutdownPrivilege BLOCK **/
}
return status;
@@ -641,8 +652,20 @@
if(*abort_shutdown_script) {
int abort_shutdown_ret;
+ SE_PRIV se_shutdown = SE_REMOTE_SHUTDOWN;
+ BOOL can_shutdown;
+
+ can_shutdown = user_has_privileges( p-pipe_user.nt_user_token,
se_shutdown );
+
+ /** BEGIN SeRemoteShutdownPrivilege BLOCK **/
+ if ( can_shutdown )
+ become_root();
abort_shutdown_ret = smbrun(abort_shutdown_script,NULL);
DEBUG(3,(_reg_abort_shutdown: Running the command `%s' gave
%d\n,abort_shutdown_script,abort_shutdown_ret));
+ if ( can_shutdown )
+ unbecome_root();
+ /** END SeRemoteShutdownPrivilege BLOCK **/
+
}
return status;
svn commit: samba r4825 - in branches/SAMBA_3_0/source/rpc_server: .
Author: jerry Date: 2005-01-18 19:51:36 + (Tue, 18 Jan 2005) New Revision: 4825 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=4825 Log: Printing changes * bracket the add/delete/set printer scripts with checks for se_print_op * slight change to the add/set printer script semantics. smbd no longer relies on output from the script (on stdout) to re-read smb.conf * remove SIGHUP from set/add/delete printin script code and now just use MSG_SMB_CONF_UPDATED * bracket the add/delete/set share scripts with checks for se_print_op (this includes setting share ACLs) Modified: branches/SAMBA_3_0/source/rpc_server/srv_spoolss_nt.c branches/SAMBA_3_0/source/rpc_server/srv_srvsvc_nt.c Changeset: Sorry, the patch is too large (368 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=4825
svn commit: samba r4826 - in trunk/source: . include lib param rpc_client rpc_server rpcclient utils
Author: jerry Date: 2005-01-18 20:18:30 + (Tue, 18 Jan 2005) New Revision: 4826 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=4826 Log: merge recent privilege changes from 3.0 Added: trunk/source/utils/net_rpc_rights.c Modified: trunk/source/Makefile.in trunk/source/include/privileges.h trunk/source/lib/privileges.c trunk/source/param/loadparm.c trunk/source/rpc_client/cli_lsarpc.c trunk/source/rpc_server/srv_lsa_nt.c trunk/source/rpc_server/srv_reg_nt.c trunk/source/rpc_server/srv_spoolss_nt.c trunk/source/rpc_server/srv_srvsvc_nt.c trunk/source/rpcclient/cmd_lsarpc.c trunk/source/utils/net.h trunk/source/utils/net_rpc.c Changeset: Sorry, the patch is too large (1153 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=4826
svn commit: samba r4827 - in branches/SAMBA_3_0/source/utils: .
Author: jerry
Date: 2005-01-18 20:51:06 + (Tue, 18 Jan 2005)
New Revision: 4827
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=4827
Log:
add 'net rpc rights list accounts' update help text
Modified:
branches/SAMBA_3_0/source/utils/net_rpc_rights.c
Changeset:
Modified: branches/SAMBA_3_0/source/utils/net_rpc_rights.c
===
--- branches/SAMBA_3_0/source/utils/net_rpc_rights.c2005-01-18 20:18:30 UTC
(rev 4826)
+++ branches/SAMBA_3_0/source/utils/net_rpc_rights.c2005-01-18 20:51:06 UTC
(rev 4827)
@@ -46,8 +46,11 @@
result = cli_lsa_lookup_names(cli, mem_ctx, pol, 1, name, sids,
sid_types);
- if (!NT_STATUS_IS_OK(result))
+ if (!NT_STATUS_IS_OK(result)) {
+ d_printf(Failed to convert \%s\ to a SID [%s]\n,
+ name, nt_errstr(result));
goto done;
+ }
sid_copy( sid, sids[0] );
@@ -117,9 +120,12 @@
if (!NT_STATUS_IS_OK(result))
return result;
+
+ if ( count == 0 )
+ d_printf(No privileges assigned\n);
for (i = 0; i count; i++) {
- printf(%30s\n, rights[i]);
+ printf(%s\n, rights[i]);
}
return NT_STATUS_OK;
@@ -128,6 +134,39 @@
/
/
+static NTSTATUS enum_privileges_for_accounts( TALLOC_CTX *ctx, struct
cli_state *cli,
+ POLICY_HND *pol )
+{
+ NTSTATUS result;
+ uint32 enum_context=0;
+ uint32 pref_max_length=0x1000;
+ DOM_SID *sids;
+ uint32 count=0;
+ int i;
+
+ result = cli_lsa_enum_sids(cli, ctx, pol, enum_context,
+ pref_max_length, count, sids);
+
+ if (!NT_STATUS_IS_OK(result))
+ return result;
+
+ for ( i=0; icount; i++ ) {
+
+ d_printf(%s\n, sid_string_static(sids[i]));
+ result = enum_privileges_for_user( ctx, cli, pol, sids[i] );
+
+ if ( !NT_STATUS_IS_OK(result) )
+ return result;
+
+ d_printf(\n);
+ }
+
+ return NT_STATUS_OK;
+}
+
+/
+/
+
static NTSTATUS rpc_rights_list_internal( const DOM_SID *domain_sid, const
char *domain_name,
struct cli_state *cli, TALLOC_CTX *mem_ctx,
int argc, const char **argv )
@@ -148,13 +187,19 @@
break;
case 1:
- /* TODO: add special name 'accounts' which lists all privileged
- SIDs and their associated rights */
+ /* special case to enuemrate all privileged SIDs
+ with associated rights */
+
+ if ( strequal( argv[0], accounts ) ) {
+ result = enum_privileges_for_accounts( mem_ctx, cli,
pol );
+ }
+ else {
- result = name_to_sid(cli, mem_ctx, sid, argv[0]);
- if (!NT_STATUS_IS_OK(result))
- goto done;
- result = enum_privileges_for_user( mem_ctx, cli, pol, sid );
+ result = name_to_sid(cli, mem_ctx, sid, argv[0]);
+ if (!NT_STATUS_IS_OK(result))
+ goto done;
+ result = enum_privileges_for_user( mem_ctx, cli, pol,
sid );
+ }
break;
default:
@@ -300,14 +345,14 @@
static int net_help_rights( int argc, const char **argv )
{
- d_printf(net rpc rights list View available privileges\n);
- d_printf(net rpc rights grant View available privileges\n);
- d_printf(net rpc rights revoke View available privileges\n);
+ d_printf(net rpc rights list [accounts|username] View available or
assigned privileges\n);
+ d_printf(net rpc rights grant name|SID right Assign
privilege[s]\n);
+ d_printf(net rpc rights revoke name|SID right Revoke
privilege[s]\n);
- d_printf(Both 'grant' and 'revoke' require a SID and a commaa
separated\n);
- d_printf(list of privilege names. For example\n);
- d_printf( net rpc grant S-1-5-32-550 SePrintOperatorsPrivilege\n);
- d_printf(would grant the printer admin right to the 'BUILTIN\\Print
Operators' group\n);
+ d_printf(\nBoth 'grant' and 'revoke' require a SID and a list of
privilege names.\n);
+ d_printf(For example\n);
+ d_printf(\n net rpc grant 'VALE\\biddle' SePrintOperatorPrivilege
svn commit: samba r4828 - in branches/SAMBA_4_0/source: .
Author: tridge Date: 2005-01-18 21:11:19 + (Tue, 18 Jan 2005) New Revision: 4828 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=4828 Log: don't apply the schema until we get it working properly Modified: branches/SAMBA_4_0/source/provision.ldif Changeset: Sorry, the patch is too large (37395 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=4828
svn commit: samba r4829 - in trunk/source/smbd: .
Author: jra
Date: 2005-01-18 22:40:40 + (Tue, 18 Jan 2005)
New Revision: 4829
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=4829
Log:
Fix for problem noticed by Guy Harris [EMAIL PROTECTED], return
correct DOS/NT error code on transact named pipe on closed pipe
handle.
Jeremy.
Modified:
trunk/source/smbd/ipc.c
Changeset:
Modified: trunk/source/smbd/ipc.c
===
--- trunk/source/smbd/ipc.c 2005-01-18 21:11:19 UTC (rev 4828)
+++ trunk/source/smbd/ipc.c 2005-01-18 22:40:40 UTC (rev 4829)
@@ -269,7 +269,7 @@
/* First find out the name of this file. */
if (suwcnt != 2) {
DEBUG(0,(Unexpected named pipe transaction.\n));
- return(-1);
+ return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
}
/* Get the file handle and hence the file name. */
@@ -290,7 +290,7 @@
}
DEBUG(1,(api_fd_reply: INVALID PIPE HANDLE: %x\n, pnum));
- return api_no_reply(outbuf, mdrcnt);
+ return ERROR_NT(NT_STATUS_INVALID_HANDLE);
}
DEBUG(3,(Got API command 0x%x on pipe \%s\ (pnum %x)\n, subcommand,
p-name, pnum));
@@ -315,6 +315,8 @@
/* Set Named Pipe Handle state */
reply = api_SNPHS(outbuf, p, params, tpscnt);
break;
+ default:
+ return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
}
if (!reply)
svn commit: samba r4830 - in branches/SAMBA_3_0/source/smbd: .
Author: jra
Date: 2005-01-18 22:40:49 + (Tue, 18 Jan 2005)
New Revision: 4830
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=4830
Log:
Fix for problem noticed by Guy Harris [EMAIL PROTECTED], return
correct DOS/NT error code on transact named pipe on closed pipe
handle.
Jeremy.
Modified:
branches/SAMBA_3_0/source/smbd/ipc.c
Changeset:
Modified: branches/SAMBA_3_0/source/smbd/ipc.c
===
--- branches/SAMBA_3_0/source/smbd/ipc.c2005-01-18 22:40:40 UTC (rev
4829)
+++ branches/SAMBA_3_0/source/smbd/ipc.c2005-01-18 22:40:49 UTC (rev
4830)
@@ -269,7 +269,7 @@
/* First find out the name of this file. */
if (suwcnt != 2) {
DEBUG(0,(Unexpected named pipe transaction.\n));
- return(-1);
+ return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
}
/* Get the file handle and hence the file name. */
@@ -290,7 +290,7 @@
}
DEBUG(1,(api_fd_reply: INVALID PIPE HANDLE: %x\n, pnum));
- return api_no_reply(outbuf, mdrcnt);
+ return ERROR_NT(NT_STATUS_INVALID_HANDLE);
}
DEBUG(3,(Got API command 0x%x on pipe \%s\ (pnum %x)\n, subcommand,
p-name, pnum));
@@ -315,6 +315,8 @@
/* Set Named Pipe Handle state */
reply = api_SNPHS(outbuf, p, params, tpscnt);
break;
+ default:
+ return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
}
if (!reply)
Build status as of Wed Jan 19 00:00:02 2005
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2005-01-18 00:00:18.0 + +++ /home/build/master/cache/broken_results.txt 2005-01-19 00:00:17.0 + @@ -1,48 +1,69 @@ -Build status as of Tue Jan 18 00:00:02 2005 +Build status as of Wed Jan 19 00:00:02 2005 Build counts: Tree Total Broken Panic -ccache 35 2 0 -distcc 33 4 0 -ppp 9 0 0 -rsync37 2 0 -samba2 1 1 +ccache 42 7 0 +distcc 42 8 0 +ppp 20 3 0 +rsync43 6 0 +samba2 2 2 samba-docs 0 0 0 -samba4 39 12 0 -samba_3_039 11 1 +samba4 45 13 0 +samba_3_044 14 1 Currently broken builds: Host Tree Compiler Status aix1 rsynccc 77/?/?/? -aix1 samba4 cc 127/?/?/? +aix1 samba4 cc 77/?/?/? aix1 samba_3_0cc 77/?/?/? mungerasamba_3_0gccok/ok/ok/ 2/PANIC fusberta samba4 gccok/ 2/?/? yurok distcc gcc 127/?/?/? rhonwynsamba4 gcc-4.0ok/ 2/?/? rhonwynsamba_3_0gcc-4.0ok/ 2/?/? -superego samba4 gccok/ 2/?/? gc8samba4 gccok/ 1/?/? -aretnapsamba_3_0icc 127/?/?/? +aretnapccache iccok/ok/ok/ 1 smartserv1 samba_3_0gcc-4.0ok/ok/ok/ 2 gwen distcc cc ok/ 1/?/? gwen samba4 cc ok/ 1/?/? +gwen ccache gcc 77/?/?/? +gwen distcc gcc 77/?/?/? +gwen rsyncgcc 77/?/?/? +gwen samba4 gcc 77/?/?/? +gwen samba_3_0gcc 77/?/?/? +gwen ccache icc 77/?/?/? +gwen distcc icc 77/?/?/? +gwen rsyncicc 77/?/?/? +gwen samba4 icc 77/?/?/? +gwen samba_3_0icc 77/?/?/? au2distcc cc ok/ 1/?/? au2distcc gccok/ 1/?/? -us4samba4 cc ok/ 1/?/? -us4samba4 gccok/ 1/?/? flock samba4 gccok/ 1/?/? svamp samba_3_0gccok/ok/ok/ 42 opisol10 ccache gccok/ok/ok/ 1 +opisol10 ppp gccok/ 1/?/? opisol10 samba4 gccok/ 1/?/? opisol10 samba_3_0gccok/ 1/?/? -gc20 samba4 gccok/ 2/?/? +sun1 samba4 cc ok/ 2/?/? sun1 samba_3_0cc ok/ 2/?/? sun1 samba_3_0gccok/ok/ok/ 1 +sun1 ccache icc 77/?/?/? +sun1 distcc icc 77/?/?/? +sun1 rsyncicc 77/?/?/? +sun1 samba4 icc 77/?/?/? +sun1 samba_3_0icc 77/?/?/? +Isis ccache cc 77/?/?/? +Isis distcc cc 77/?/?/? +Isis rsynccc 77/?/?/? +Isis samba4 cc 77/?/?/? +Isis samba_3_0cc 77/?/?/? +Isis ppp gccok/ 2/?/? fire1 samba_3_0cc ok/ 2/?/? m30ccache gccok/ok/ok/ 2 m30rsyncgccok/ok/ok/ 2 m30samba4 gccok/ 2/?/? m30samba_3_0gccok/ok/ok/ 42 metze02sambagccok/ok/ok/ 1/PANIC +metze01sambagccok/ok/ok/ 1/PANIC +opippp gccok/ 2/?/?
svn commit: samba r4831 - in branches/SAMBA_4_0/source: lib/socket torture torture/local
Author: tridge Date: 2005-01-19 03:20:20 + (Wed, 19 Jan 2005) New Revision: 4831 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=4831 Log: added udp support to our generic sockets library. I decided to incorporate the udp support into the socket_ipv4.c backend (and later in socket_ipv6.c) rather than doing a separate backend, as so much of the code is shareable. Basically this adds a socket_sendto() and a socket_recvfrom() call and not much all. For udp servers, I decided to keep the call as socket_listen(), even though dgram servers don't actually call listen(). This keeps the API consistent. I also added a simple local sockets testsuite in smbtorture, LOCAL-SOCKET Added: branches/SAMBA_4_0/source/torture/local/socket.c Modified: branches/SAMBA_4_0/source/lib/socket/socket.c branches/SAMBA_4_0/source/lib/socket/socket.h branches/SAMBA_4_0/source/lib/socket/socket_ipv4.c branches/SAMBA_4_0/source/lib/socket/socket_ipv6.c branches/SAMBA_4_0/source/lib/socket/socket_unix.c branches/SAMBA_4_0/source/torture/config.mk branches/SAMBA_4_0/source/torture/torture.c Changeset: Sorry, the patch is too large (744 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=4831
svn commit: samba r4832 - in branches/SAMBA_4_0/source/torture/local: .
Author: tridge
Date: 2005-01-19 03:33:49 + (Wed, 19 Jan 2005)
New Revision: 4832
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=4832
Log:
added simple testing of tcp sockets to LOCAL-SOCKET test
Modified:
branches/SAMBA_4_0/source/torture/local/socket.c
Changeset:
Modified: branches/SAMBA_4_0/source/torture/local/socket.c
===
--- branches/SAMBA_4_0/source/torture/local/socket.c2005-01-19 03:20:20 UTC
(rev 4831)
+++ branches/SAMBA_4_0/source/torture/local/socket.c2005-01-19 03:33:49 UTC
(rev 4832)
@@ -45,6 +45,8 @@
size_t sent, nread;
BOOL ret = True;
+ printf(TESTING UDP SOCKETS\n);
+
status = socket_create(ip, SOCKET_TYPE_DGRAM, sock1, 0);
CHECK_STATUS(status, NT_STATUS_OK);
talloc_steal(mem_ctx, sock1);
@@ -123,12 +125,118 @@
return ret;
}
+/*
+ basic testing of tcp routines
+*/
+static BOOL test_tcp(TALLOC_CTX *mem_ctx)
+{
+ struct socket_context *sock1, *sock2, *sock3;
+ NTSTATUS status;
+ int srv_port, from_port;
+ const char *srv_addr, *from_addr;
+ size_t size = 100 + (random() % 100);
+ DATA_BLOB blob, blob2;
+ size_t sent, nread;
+ BOOL ret = True;
+
+ printf(TESTING TCP SOCKETS\n);
+
+ status = socket_create(ip, SOCKET_TYPE_STREAM, sock1, 0);
+ CHECK_STATUS(status, NT_STATUS_OK);
+ talloc_steal(mem_ctx, sock1);
+
+ status = socket_create(ip, SOCKET_TYPE_STREAM, sock2, 0);
+ CHECK_STATUS(status, NT_STATUS_OK);
+ talloc_steal(mem_ctx, sock2);
+
+ status = socket_listen(sock1, 127.0.0.1, 0, 0, 0);
+ CHECK_STATUS(status, NT_STATUS_OK);
+
+ srv_addr = socket_get_my_addr(sock1, mem_ctx);
+ if (srv_addr == NULL || strcmp(srv_addr, 127.0.0.1) != 0) {
+ printf(Expected server address of 127.0.0.1 but got %s\n,
srv_addr);
+ return False;
+ }
+
+ srv_port = socket_get_my_port(sock1);
+ printf(server port is %d\n, srv_port);
+
+ status = socket_connect(sock2, NULL, 0, srv_addr, srv_port, 0);
+ CHECK_STATUS(status, NT_STATUS_OK);
+
+ status = socket_accept(sock1, sock3);
+ CHECK_STATUS(status, NT_STATUS_OK);
+ talloc_steal(mem_ctx, sock3);
+ talloc_free(sock1);
+
+ blob = data_blob_talloc(mem_ctx, NULL, size);
+ blob2 = data_blob_talloc(mem_ctx, NULL, size);
+ generate_random_buffer(blob.data, blob.length);
+
+ sent = size;
+ status = socket_send(sock2, blob, sent, 0);
+ CHECK_STATUS(status, NT_STATUS_OK);
+
+ status = socket_recv(sock3, blob2.data, size, nread, 0);
+ CHECK_STATUS(status, NT_STATUS_OK);
+
+ from_addr = socket_get_peer_addr(sock3, mem_ctx);
+ from_port = socket_get_peer_port(sock3);
+
+ if (strcmp(from_addr, srv_addr) != 0) {
+ printf(Unexpected recvfrom addr %s\n, from_addr);
+ ret = False;
+ }
+ if (nread != size) {
+ printf(Unexpected recvfrom size %d should be %d\n, nread,
size);
+ ret = False;
+ }
+
+ if (memcmp(blob2.data, blob.data, size) != 0) {
+ printf(Bad data in recvfrom\n);
+ ret = False;
+ }
+
+ generate_random_buffer(blob.data, blob.length);
+ status = socket_send(sock3, blob, sent, 0);
+ CHECK_STATUS(status, NT_STATUS_OK);
+
+ status = socket_recv(sock2, blob2.data, size, nread, 0);
+ CHECK_STATUS(status, NT_STATUS_OK);
+
+ from_addr = socket_get_peer_addr(sock2, mem_ctx);
+ from_port = socket_get_peer_port(sock2);
+
+ if (strcmp(from_addr, srv_addr) != 0) {
+ printf(Unexpected recvfrom addr %s\n, from_addr);
+ ret = False;
+ }
+ if (nread != size) {
+ printf(Unexpected recvfrom size %d should be %d\n, nread,
size);
+ ret = False;
+ }
+ if (from_port != srv_port) {
+ printf(Unexpected recvfrom port %d should be %d\n,
+ from_port, srv_port);
+ ret = False;
+ }
+ if (memcmp(blob2.data, blob.data, size) != 0) {
+ printf(Bad data in recvfrom\n);
+ ret = False;
+ }
+
+done:
+
+ return ret;
+}
+
BOOL torture_local_socket(void)
{
BOOL ret = True;
TALLOC_CTX *mem_ctx = talloc_new(NULL);
ret = test_udp(mem_ctx);
+ ret = test_tcp(mem_ctx);
return ret;
}
svn commit: samba r4833 - in branches/SAMBA_4_0/source/script/tests: .
Author: tridge Date: 2005-01-19 03:34:49 + (Wed, 19 Jan 2005) New Revision: 4833 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=4833 Log: added LOCAL-SOCKET to the list of tests that are expected to pass Modified: branches/SAMBA_4_0/source/script/tests/test_posix.sh Changeset: Modified: branches/SAMBA_4_0/source/script/tests/test_posix.sh === --- branches/SAMBA_4_0/source/script/tests/test_posix.sh2005-01-19 03:33:49 UTC (rev 4832) +++ branches/SAMBA_4_0/source/script/tests/test_posix.sh2005-01-19 03:34:49 UTC (rev 4833) @@ -43,6 +43,7 @@ tests=$tests RAW-UNLINK RAW-READ RAW-CLOSE RAW-IOCTL RAW-SEARCH RAW-CHKPATH RAW-RENAME tests=$tests RAW-EAS RAW-STREAMS RAW-ACLS tests=$tests LOCAL-ICONV LOCAL-TALLOC LOCAL-MESSAGING LOCAL-BINDING LOCAL-IDTREE +tests=$tests LOCAL-SOCKET soon=BASE-CHARSET RAW-OPLOCK RAW-NOTIFY BASE-DELAYWRITE
svn commit: samba r4834 - in hooks: .
Author: tpot
Date: 2005-01-19 04:21:47 + (Wed, 19 Jan 2005)
New Revision: 4834
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=4834
Log:
Create a delta to apply to the websvn repository and send it over
to dp3. This is in preparation for getting rid of rsync as the
method for synchronising the websvn repository with the real one.
Modified:
hooks/post-commit
Changeset:
Modified: hooks/post-commit
===
--- hooks/post-commit 2005-01-19 03:34:49 UTC (rev 4833)
+++ hooks/post-commit 2005-01-19 04:21:47 UTC (rev 4834)
@@ -41,3 +41,12 @@
${REPOS}/hooks/synchooks.sh ${REPOS} ${REV}
(python2.2 /home/svnanon/bin/ciabot_svn.py ${REPOS} ${REV} Samba )
+# Create a delta to apply to the websvn repository and send it over
+# to dp3.
+
+(
+ delta=/tmp/delta-${NAME}-`seq -f%08g ${REV} ${REV}`
+
+ svnadmin dump ${REPOS} --incremental -r ${REV} $delta
+ rsync $delta dp3::svn-deltas rm -f $delta
+)
svn commit: samba r4835 - in test: .
Author: tpot Date: 2005-01-19 04:28:04 + (Wed, 19 Jan 2005) New Revision: 4835 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=4835 Log: Testing post-commit hook changes. Modified: test/dummy Changeset: Modified: test/dummy === --- test/dummy 2005-01-19 04:21:47 UTC (rev 4834) +++ test/dummy 2005-01-19 04:28:04 UTC (rev 4835) @@ -1,3 +1,4 @@ commit test test 3 +foo
svn commit: samba r4836 - in test: .
Author: tpot Date: 2005-01-19 04:35:06 + (Wed, 19 Jan 2005) New Revision: 4836 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=4836 Log: Another test. Modified: test/dummy Changeset: Modified: test/dummy === --- test/dummy 2005-01-19 04:28:04 UTC (rev 4835) +++ test/dummy 2005-01-19 04:35:06 UTC (rev 4836) @@ -2,3 +2,4 @@ test 3 foo +foo2
svn commit: samba r4837 - in test: .
Author: tpot Date: 2005-01-19 04:42:12 + (Wed, 19 Jan 2005) New Revision: 4837 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=4837 Log: Final (?) test. Modified: test/dummy Changeset: Modified: test/dummy === --- test/dummy 2005-01-19 04:35:06 UTC (rev 4836) +++ test/dummy 2005-01-19 04:42:12 UTC (rev 4837) @@ -3,3 +3,4 @@ test 3 foo foo2 +foo3
svn commit: samba r4838 - in hooks: .
Author: tpot
Date: 2005-01-19 05:02:17 + (Wed, 19 Jan 2005)
New Revision: 4838
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=4838
Log:
Add some comments.
Modified:
hooks/post-commit
Changeset:
Modified: hooks/post-commit
===
--- hooks/post-commit 2005-01-19 04:42:12 UTC (rev 4837)
+++ hooks/post-commit 2005-01-19 05:02:17 UTC (rev 4838)
@@ -36,9 +36,20 @@
REV=$2
NAME=`basename ${REPOS}`
+# Send email to everyone
+
${REPOS}/hooks/commit-email.pl -s svn commit: ${NAME} ${REPOS} ${REV}
[EMAIL PROTECTED]
+
+# Keep a hot backup of the repository
+
(cd ${REPOS}/hooks; ./hot-backup.py ${REPOS} /backup/svn_backup/${NAME} )
+
+# Update hooks directory if this commit has changed it. (Syn chooks - ha ha).
+
${REPOS}/hooks/synchooks.sh ${REPOS} ${REV}
+
+# Run ciabot script for a nice web front end to the commit messages.
+
(python2.2 /home/svnanon/bin/ciabot_svn.py ${REPOS} ${REV} Samba )
# Create a delta to apply to the websvn repository and send it over
svn commit: lorikeet r189 - in trunk/ethereal/plugins/pidl: .
Author: tpot
Date: 2005-01-19 06:05:25 + (Wed, 19 Jan 2005)
New Revision: 189
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=lorikeetrev=189
Log:
Add parsers for WERROR and arrays of uint16's.
Modified:
trunk/ethereal/plugins/pidl/eparser.c
trunk/ethereal/plugins/pidl/eparser.h
Changeset:
Modified: trunk/ethereal/plugins/pidl/eparser.c
===
--- trunk/ethereal/plugins/pidl/eparser.c 2005-01-18 06:54:15 UTC (rev
188)
+++ trunk/ethereal/plugins/pidl/eparser.c 2005-01-19 06:05:25 UTC (rev
189)
@@ -159,6 +159,16 @@
return NT_STATUS_OK;
}
+NTSTATUS ndr_pull_WERROR(struct pidl_pull *ndr, pidl_tree *tree, int hf,
+WERROR *data)
+{
+ ndr-offset = dissect_doserror(
+ ndr-tvb, ndr-offset, ndr-pinfo, tree-proto_tree,
+ ndr-drep, hf, data);
+
+ return NT_STATUS_OK;
+}
+
NTSTATUS ndr_pull_HYPER_T(struct pidl_pull *ndr, pidl_tree *tree, int hf,
HYPER_T *data)
{
@@ -472,8 +482,6 @@
pidl_tree *tree, int hf, uint8_t *data,
uint32_t n)
{
- uint32_t i;
-
if (!(ndr_flags NDR_SCALARS))
return NT_STATUS_OK;
@@ -491,7 +499,6 @@
uint32_t n)
{
int len = n * sizeof(uint32_t);
- uint32_t i;
if (!(ndr_flags NDR_SCALARS))
return NT_STATUS_OK;
@@ -507,6 +514,26 @@
return NT_STATUS_OK;
}
+NTSTATUS ndr_pull_array_uint16(struct pidl_pull *ndr, int ndr_flags,
+ pidl_tree *tree, int hf, uint16_t *data,
+ uint32_t n)
+{
+ int len = n * sizeof(uint16_t);
+
+ if (!(ndr_flags NDR_SCALARS))
+ return NT_STATUS_OK;
+
+ ndr_pull_align(ndr, sizeof(uint16_t));
+
+ proto_tree_add_bytes(
+ tree-proto_tree, hf, ndr-tvb, ndr-offset, len,
+ tvb_get_ptr(ndr-tvb, ndr-offset, len));
+
+ ndr-offset += len;
+
+ return NT_STATUS_OK;
+}
+
NTSTATUS ndr_pull_struct_start(struct pidl_pull *ndr)
{
return NT_STATUS_OK;
@@ -516,8 +543,8 @@
{
}
-NTSTATUS ndr_pull_error(struct pidl_pull *ndr,
- enum ndr_err_code err, const char *format, ...)
+NTSTATUS ndr_pull_error(struct pidl_pull *ndr, enum ndr_err_code err,
+ const char *format, ...)
{
return NT_STATUS_OK;
}
Modified: trunk/ethereal/plugins/pidl/eparser.h
===
--- trunk/ethereal/plugins/pidl/eparser.h 2005-01-18 06:54:15 UTC (rev
188)
+++ trunk/ethereal/plugins/pidl/eparser.h 2005-01-19 06:05:25 UTC (rev
189)
@@ -34,6 +34,7 @@
// Some miscellaneous glue to include libndr.h
typedef uint32_t NTSTATUS;
+typedef uint32_t WERROR;
typedef uint64_t NTTIME;
typedef uint64_t NTTIME_hyper;
typedef uint64_t HYPER_T;
@@ -44,6 +45,7 @@
#define NT_STATUS_NO_MEMORY 0xC017
#define NT_STATUS_ARRAY_BOUNDS_EXCEEDED 0xC08c
#define NT_STATUS_INVALID_PARAMETER0xC057
+#define NT_STATUS_INVALID_PARAMETER_MIX 0xC030
#define NT_STATUS_IS_OK(x) ((x) == NT_STATUS_OK)
@@ -121,6 +123,7 @@
enum ndr_err_code err, const char *format, ...);
NTSTATUS ndr_pull_string(struct pidl_pull *ndr, int ndr_flags, pidl_tree
*tree, const char **s);
NTSTATUS ndr_pull_NTSTATUS(struct pidl_pull *ndr, pidl_tree *tree, int hf,
NTSTATUS *status);
+NTSTATUS ndr_pull_WERROR(struct pidl_pull *ndr, pidl_tree *tree, int hf,
NTSTATUS *status);
NTSTATUS ndr_pull_array_size(struct pidl_pull *ndr, pidl_tree *tree, const
void *p);
uint32_t ndr_get_array_size(struct pidl_pull *ndr, const void *p);
NTSTATUS ndr_pull_array(struct pidl_pull *ndr, int ndr_flags,
@@ -130,6 +133,7 @@
pidl_tree *tree, void *));
NTSTATUS ndr_check_array_size(struct pidl_pull *ndr, void *p, uint32_t size);
NTSTATUS ndr_pull_array_uint8(struct pidl_pull *ndr, int ndr_flags, pidl_tree
*tree, int hf, uint8_t *data, uint32_t n);
+NTSTATUS ndr_pull_array_uint16(struct pidl_pull *ndr, int ndr_flags, pidl_tree
*tree, int hf, uint16_t *data, uint32_t n);
NTSTATUS ndr_pull_array_uint32(struct pidl_pull *ndr, int ndr_flags, pidl_tree
*tree, int hf, uint32_t *data, uint32_t n);
NTSTATUS ndr_pull_time_t(struct pidl_pull *ndr, pidl_tree *tree, int hf,
time_t *data);
svn commit: lorikeet r190 - in trunk/ethereal/plugins/pidl: .
Author: tpot Date: 2005-01-19 06:06:38 + (Wed, 19 Jan 2005) New Revision: 190 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=lorikeetrev=190 Log: Add WINREG parser. Doesn't work 100% as some of the string flags aren't supported in eparser.c yet. Added: trunk/ethereal/plugins/pidl/packet-dcerpc-winreg.c trunk/ethereal/plugins/pidl/packet-dcerpc-winreg.h Modified: trunk/ethereal/plugins/pidl/Makefile.am trunk/ethereal/plugins/pidl/pidl.c Changeset: Sorry, the patch is too large (3889 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=lorikeetrev=190
svn commit: lorikeet r191 - in hooks: .
Author: tpot
Date: 2005-01-19 06:28:34 + (Wed, 19 Jan 2005)
New Revision: 191
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=lorikeetrev=191
Log:
Add scriptlet to send deltas to dp3.
Modified:
hooks/post-commit
Changeset:
Modified: hooks/post-commit
===
--- hooks/post-commit 2005-01-19 06:06:38 UTC (rev 190)
+++ hooks/post-commit 2005-01-19 06:28:34 UTC (rev 191)
@@ -39,3 +39,13 @@
${REPOS}/hooks/commit-email.pl -s svn commit: ${NAME} ${REPOS} ${REV}
[EMAIL PROTECTED]
(cd ${REPOS}/hooks; ./hot-backup.py ${REPOS} /backup/svn_backup/${NAME} )
${REPOS}/hooks/synchooks.sh ${REPOS} ${REV}
+
+# Create a delta to apply to the websvn repository and send it over
+# to dp3.
+
+(
+ delta=/tmp/delta-${NAME}-`seq -f%08g ${REV} ${REV}`
+
+ svnadmin dump ${REPOS} --incremental -r ${REV} $delta
+ rsync $delta dp3::svn-deltas rm -f $delta
+)
