[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2109-gc6d9650

Günther Deschner gd at samba.org
Tue Feb 12 14:00:59 GMT 2008


The branch, v3-2-test has been updated
       via  c6d9650930510982ef4e4759272dba573fc81067 (commit)
      from  53dc913b2d01aeea2a7490c5ef1292e6c6eff5e7 (commit)

http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit c6d9650930510982ef4e4759272dba573fc81067
Author: Günther Deschner <gd at samba.org>
Date:   Tue Feb 12 14:26:10 2008 +0100

    w00t! SAMR server-side conversion to pidl is finished.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source/Makefile.in           |    2 +-
 source/configure.in          |    4 +-
 source/rpc_server/srv_pipe.c |    2 +-
 source/rpc_server/srv_samr.c |  565 ------------------------------------------
 4 files changed, 4 insertions(+), 569 deletions(-)
 delete mode 100644 source/rpc_server/srv_samr.c


Changeset truncated at 500 lines:

diff --git a/source/Makefile.in b/source/Makefile.in
index 9c16213..da5a6ca 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -467,7 +467,7 @@ RPC_LSA_OBJ = rpc_server/srv_lsa.o rpc_server/srv_lsa_nt.o librpc/gen_ndr/srv_ls
 RPC_NETLOG_OBJ = rpc_server/srv_netlog.o rpc_server/srv_netlog_nt.o \
 		 librpc/gen_ndr/srv_netlogon.o
 
-RPC_SAMR_OBJ = rpc_server/srv_samr.o rpc_server/srv_samr_nt.o \
+RPC_SAMR_OBJ = rpc_server/srv_samr_nt.o \
                rpc_server/srv_samr_util.o \
 	       librpc/gen_ndr/srv_samr.o
 
diff --git a/source/configure.in b/source/configure.in
index 5cc9019..9e4692b 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -707,7 +707,7 @@ AC_SUBST(DYNEXP)
 
 dnl Add modules that have to be built by default here
 dnl These have to be built static:
-default_static_modules="pdb_smbpasswd pdb_tdbsam rpc_lsa rpc_samr2 rpc_winreg rpc_initshutdown rpc_dssetup rpc_wkssvc rpc_svcctl2 rpc_ntsvcs rpc_net rpc_netdfs rpc_srvsvc2 rpc_spoolss rpc_eventlog2 auth_sam auth_unix auth_winbind auth_server auth_domain auth_builtin vfs_default nss_info_template"
+default_static_modules="pdb_smbpasswd pdb_tdbsam rpc_lsa rpc_samr rpc_winreg rpc_initshutdown rpc_dssetup rpc_wkssvc rpc_svcctl2 rpc_ntsvcs rpc_net rpc_netdfs rpc_srvsvc2 rpc_spoolss rpc_eventlog2 auth_sam auth_unix auth_winbind auth_server auth_domain auth_builtin vfs_default nss_info_template"
 
 dnl These are preferably build shared, and static if dlopen() is not available
 default_shared_modules="vfs_recycle vfs_audit vfs_extd_audit vfs_full_audit vfs_netatalk vfs_fake_perms vfs_default_quota vfs_readonly vfs_cap vfs_expand_msdfs vfs_shadow_copy vfs_shadow_copy2 charset_CP850 charset_CP437 auth_script vfs_readahead vfs_syncops vfs_xattr_tdb vfs_streams_xattr"
@@ -6462,7 +6462,7 @@ SMB_MODULE(rpc_netdfs, \$(RPC_DFS_OBJ), "bin/librpc_netdfs.$SHLIBEXT", RPC)
 SMB_MODULE(rpc_srvsvc2, \$(RPC_SVC_OBJ), "bin/librpc_svcsvc2.$SHLIBEXT", RPC)
 SMB_MODULE(rpc_spoolss, \$(RPC_SPOOLSS_OBJ), "bin/librpc_spoolss.$SHLIBEXT", RPC)
 SMB_MODULE(rpc_eventlog2, \$(RPC_EVENTLOG_OBJ), "bin/librpc_eventlog2.$SHLIBEXT", RPC)
-SMB_MODULE(rpc_samr2, \$(RPC_SAMR_OBJ), "bin/librpc_samr2.$SHLIBEXT", RPC)
+SMB_MODULE(rpc_samr, \$(RPC_SAMR_OBJ), "bin/librpc_samr.$SHLIBEXT", RPC)
 SMB_MODULE(rpc_rpcecho, \$(RPC_ECHO_OBJ), "bin/librpc_rpcecho.$SHLIBEXT", RPC)
 SMB_SUBSYSTEM(RPC,smbd/server.o)
 
diff --git a/source/rpc_server/srv_pipe.c b/source/rpc_server/srv_pipe.c
index 8c7c43f..06694a2 100644
--- a/source/rpc_server/srv_pipe.c
+++ b/source/rpc_server/srv_pipe.c
@@ -2367,7 +2367,7 @@ void get_pipe_fns( int idx, struct api_struct **fns, int *n_fns )
 			dssetup_get_pipe_fns( &cmds, &n_cmds );
 			break;
 		case PI_SAMR:
-			samr2_get_pipe_fns( &cmds, &n_cmds );
+			samr_get_pipe_fns( &cmds, &n_cmds );
 			break;
 		case PI_NETLOGON:
 			netlog_get_pipe_fns( &cmds, &n_cmds );
diff --git a/source/rpc_server/srv_samr.c b/source/rpc_server/srv_samr.c
deleted file mode 100644
index f7cc7ee..0000000
--- a/source/rpc_server/srv_samr.c
+++ /dev/null
@@ -1,565 +0,0 @@
-/*
- *  Unix SMB/CIFS implementation.
- *  RPC Pipe client / server routines
- *  Copyright (C) Andrew Tridgell              1992-1997,
- *  Copyright (C) Luke Kenneth Casson Leighton 1996-1997,
- *  Copyright (C) Paul Ashton                       1997,
- *  Copyright (C) Marc Jacobsen			    1999,
- *  Copyright (C) Jean François Micouleau      1998-2001,
- *  Copyright (C) Jim McDonough <jmcd at us.ibm.com> 2002-2003.
- *
- * 	Split into interface and implementation modules by,
- *
- *  Copyright (C) Jeremy Allison                    2001.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * This is the interface to the SAMR code.
- */
-
-#include "includes.h"
-
-#undef DBGC_CLASS
-#define DBGC_CLASS DBGC_RPC_SRV
-
-/*******************************************************************
- ********************************************************************/
-
-static bool proxy_samr_call(pipes_struct *p, uint8 opnum)
-{
-	struct api_struct *fns;
-	int n_fns;
-
-	samr_get_pipe_fns(&fns, &n_fns);
-
-	if (opnum >= n_fns) {
-		return false;
-	}
-
-	if (fns[opnum].opnum != opnum) {
-		smb_panic("SAMR function table not sorted");
-	}
-
-	return fns[opnum].fn(p);
-}
-
-/*******************************************************************
- api_samr_close_hnd
- ********************************************************************/
-
-static bool api_samr_close_hnd(pipes_struct *p)
-{
-	return proxy_samr_call(p, NDR_SAMR_CLOSE);
-}
-
-/*******************************************************************
- api_samr_open_domain
- ********************************************************************/
-
-static bool api_samr_open_domain(pipes_struct *p)
-{
-	return proxy_samr_call(p, NDR_SAMR_OPENDOMAIN);
-}
-
-/*******************************************************************
- api_samr_get_usrdom_pwinfo
- ********************************************************************/
-
-static bool api_samr_get_usrdom_pwinfo(pipes_struct *p)
-{
-	return proxy_samr_call(p, NDR_SAMR_GETUSERPWINFO);
-}
-
-/*******************************************************************
- api_samr_set_sec_obj
- ********************************************************************/
-
-static bool api_samr_set_sec_obj(pipes_struct *p)
-{
-	return proxy_samr_call(p, NDR_SAMR_SETSECURITY);
-}
-
-/*******************************************************************
- api_samr_query_sec_obj
- ********************************************************************/
-
-static bool api_samr_query_sec_obj(pipes_struct *p)
-{
-	return proxy_samr_call(p, NDR_SAMR_QUERYSECURITY);
-}
-
-/*******************************************************************
- api_samr_enum_dom_users
- ********************************************************************/
-
-static bool api_samr_enum_dom_users(pipes_struct *p)
-{
-	return proxy_samr_call(p, NDR_SAMR_ENUMDOMAINUSERS);
-}
-
-/*******************************************************************
- api_samr_enum_dom_groups
- ********************************************************************/
-
-static bool api_samr_enum_dom_groups(pipes_struct *p)
-{
-	return proxy_samr_call(p, NDR_SAMR_ENUMDOMAINGROUPS);
-}
-
-/*******************************************************************
- api_samr_enum_dom_aliases
- ********************************************************************/
-
-static bool api_samr_enum_dom_aliases(pipes_struct *p)
-{
-	return proxy_samr_call(p, NDR_SAMR_ENUMDOMAINALIASES);
-}
-
-/*******************************************************************
- api_samr_query_dispinfo
- ********************************************************************/
-
-static bool api_samr_query_dispinfo(pipes_struct *p)
-{
-	return proxy_samr_call(p, NDR_SAMR_QUERYDISPLAYINFO);
-}
-
-/*******************************************************************
- api_samr_query_aliasinfo
- ********************************************************************/
-
-static bool api_samr_query_aliasinfo(pipes_struct *p)
-{
-	return proxy_samr_call(p, NDR_SAMR_QUERYALIASINFO);
-}
-
-/*******************************************************************
- api_samr_lookup_names
- ********************************************************************/
-
-static bool api_samr_lookup_names(pipes_struct *p)
-{
-	return proxy_samr_call(p, NDR_SAMR_LOOKUPNAMES);
-}
-
-/*******************************************************************
- api_samr_chgpasswd_user
- ********************************************************************/
-
-static bool api_samr_chgpasswd_user(pipes_struct *p)
-{
-	return proxy_samr_call(p, NDR_SAMR_CHANGEPASSWORDUSER2);
-}
-
-/*******************************************************************
- api_samr_lookup_rids
- ********************************************************************/
-
-static bool api_samr_lookup_rids(pipes_struct *p)
-{
-	return proxy_samr_call(p, NDR_SAMR_LOOKUPRIDS);
-}
-
-/*******************************************************************
- api_samr_open_user
- ********************************************************************/
-
-static bool api_samr_open_user(pipes_struct *p)
-{
-	return proxy_samr_call(p, NDR_SAMR_OPENUSER);
-}
-
-/*******************************************************************
- api_samr_query_userinfo
- ********************************************************************/
-
-static bool api_samr_query_userinfo(pipes_struct *p)
-{
-	return proxy_samr_call(p, NDR_SAMR_QUERYUSERINFO);
-}
-
-/*******************************************************************
- api_samr_query_usergroups
- ********************************************************************/
-
-static bool api_samr_query_usergroups(pipes_struct *p)
-{
-	return proxy_samr_call(p, NDR_SAMR_GETGROUPSFORUSER);
-}
-
-/*******************************************************************
- api_samr_query_domain_info
- ********************************************************************/
-
-static bool api_samr_query_domain_info(pipes_struct *p)
-{
-	return proxy_samr_call(p, NDR_SAMR_QUERYDOMAININFO);
-}
-
-/*******************************************************************
- api_samr_create_user
- ********************************************************************/
-
-static bool api_samr_create_user(pipes_struct *p)
-{
-	return proxy_samr_call(p, NDR_SAMR_CREATEUSER2);
-}
-
-/*******************************************************************
- api_samr_connect_anon
- ********************************************************************/
-
-static bool api_samr_connect_anon(pipes_struct *p)
-{
-	return proxy_samr_call(p, NDR_SAMR_CONNECT);
-}
-
-/*******************************************************************
- api_samr_connect
- ********************************************************************/
-
-static bool api_samr_connect(pipes_struct *p)
-{
-	return proxy_samr_call(p, NDR_SAMR_CONNECT2);
-}
-
-/*******************************************************************
- api_samr_connect4
- ********************************************************************/
-
-static bool api_samr_connect4(pipes_struct *p)
-{
-	return proxy_samr_call(p, NDR_SAMR_CONNECT4);
-}
-
-/*******************************************************************
- api_samr_chgpasswd_user3
- ********************************************************************/
-
-static bool api_samr_chgpasswd_user3(pipes_struct *p)
-{
-	return proxy_samr_call(p, NDR_SAMR_CHANGEPASSWORDUSER3);
-}
-
-/*******************************************************************
- api_samr_connect5
- ********************************************************************/
-
-static bool api_samr_connect5(pipes_struct *p)
-{
-	return proxy_samr_call(p, NDR_SAMR_CONNECT5);
-}
-
-/**********************************************************************
- api_samr_lookup_domain
- **********************************************************************/
-
-static bool api_samr_lookup_domain(pipes_struct *p)
-{
-	return proxy_samr_call(p, NDR_SAMR_LOOKUPDOMAIN);
-}
-
-/**********************************************************************
- api_samr_enum_domains
- **********************************************************************/
-
-static bool api_samr_enum_domains(pipes_struct *p)
-{
-	return proxy_samr_call(p, NDR_SAMR_ENUMDOMAINS);
-}
-
-/*******************************************************************
- api_samr_open_alias
- ********************************************************************/
-
-static bool api_samr_open_alias(pipes_struct *p)
-{
-	return proxy_samr_call(p, NDR_SAMR_OPENALIAS);
-}
-
-/*******************************************************************
- api_samr_set_userinfo
- ********************************************************************/
-
-static bool api_samr_set_userinfo(pipes_struct *p)
-{
-	return proxy_samr_call(p, NDR_SAMR_SETUSERINFO);
-}
-
-/*******************************************************************
- api_samr_set_userinfo2
- ********************************************************************/
-
-static bool api_samr_set_userinfo2(pipes_struct *p)
-{
-	return proxy_samr_call(p, NDR_SAMR_SETUSERINFO2);
-}
-
-/*******************************************************************
- api_samr_query_useraliases
- ********************************************************************/
-
-static bool api_samr_query_useraliases(pipes_struct *p)
-{
-	return proxy_samr_call(p, NDR_SAMR_GETALIASMEMBERSHIP);
-}
-
-/*******************************************************************
- api_samr_query_aliasmem
- ********************************************************************/
-
-static bool api_samr_query_aliasmem(pipes_struct *p)
-{
-	return proxy_samr_call(p, NDR_SAMR_GETMEMBERSINALIAS);
-}
-
-/*******************************************************************
- api_samr_query_groupmem
- ********************************************************************/
-
-static bool api_samr_query_groupmem(pipes_struct *p)
-{
-	return proxy_samr_call(p, NDR_SAMR_QUERYGROUPMEMBER);
-}
-
-/*******************************************************************
- api_samr_add_aliasmem
- ********************************************************************/
-
-static bool api_samr_add_aliasmem(pipes_struct *p)
-{
-	return proxy_samr_call(p, NDR_SAMR_ADDALIASMEMBER);
-}
-
-/*******************************************************************
- api_samr_del_aliasmem
- ********************************************************************/
-
-static bool api_samr_del_aliasmem(pipes_struct *p)
-{
-	return proxy_samr_call(p, NDR_SAMR_DELETEALIASMEMBER);
-}
-
-/*******************************************************************
- api_samr_add_groupmem
- ********************************************************************/
-
-static bool api_samr_add_groupmem(pipes_struct *p)
-{
-	return proxy_samr_call(p, NDR_SAMR_ADDGROUPMEMBER);
-}
-
-/*******************************************************************
- api_samr_del_groupmem
- ********************************************************************/
-
-static bool api_samr_del_groupmem(pipes_struct *p)
-{
-	return proxy_samr_call(p, NDR_SAMR_DELETEGROUPMEMBER);
-}
-
-/*******************************************************************
- api_samr_delete_dom_user
- ********************************************************************/
-
-static bool api_samr_delete_dom_user(pipes_struct *p)
-{
-	return proxy_samr_call(p, NDR_SAMR_DELETEUSER);
-}
-
-/*******************************************************************
- api_samr_delete_dom_group
- ********************************************************************/
-
-static bool api_samr_delete_dom_group(pipes_struct *p)
-{
-	return proxy_samr_call(p, NDR_SAMR_DELETEDOMAINGROUP);
-}
-
-/*******************************************************************
- api_samr_delete_dom_alias
- ********************************************************************/
-
-static bool api_samr_delete_dom_alias(pipes_struct *p)
-{
-	return proxy_samr_call(p, NDR_SAMR_DELETEDOMALIAS);
-}
-
-/*******************************************************************
- api_samr_create_dom_group
- ********************************************************************/
-
-static bool api_samr_create_dom_group(pipes_struct *p)
-{
-	return proxy_samr_call(p, NDR_SAMR_CREATEDOMAINGROUP);
-}
-
-/*******************************************************************
- api_samr_create_dom_alias
- ********************************************************************/
-
-static bool api_samr_create_dom_alias(pipes_struct *p)
-{
-	return proxy_samr_call(p, NDR_SAMR_CREATEDOMALIAS);
-}
-
-/*******************************************************************
- api_samr_query_groupinfo
- ********************************************************************/
-
-static bool api_samr_query_groupinfo(pipes_struct *p)
-{
-	return proxy_samr_call(p, NDR_SAMR_QUERYGROUPINFO);
-}
-
-/*******************************************************************
- api_samr_set_groupinfo
- ********************************************************************/
-
-static bool api_samr_set_groupinfo(pipes_struct *p)
-{
-	return proxy_samr_call(p, NDR_SAMR_SETGROUPINFO);
-}
-
-/*******************************************************************
- api_samr_set_aliasinfo
- ********************************************************************/
-
-static bool api_samr_set_aliasinfo(pipes_struct *p)
-{
-	return proxy_samr_call(p, NDR_SAMR_SETALIASINFO);
-}
-
-/*******************************************************************


-- 
Samba Shared Repository


More information about the samba-cvs mailing list