[SCM] Samba Shared Repository - branch v3-2-test updated -
initial-v3-2-test-2120-gf4581e9
Günther Deschner
gd at samba.org
Tue Feb 12 21:09:37 GMT 2008
The branch, v3-2-test has been updated
via f4581e9f4482566fba9436d5ae058b8d840fa394 (commit)
from cac740d87f729c1b48654ef4f51f37a81e8a0d54 (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit f4581e9f4482566fba9436d5ae058b8d840fa394
Author: Günther Deschner <gd at samba.org>
Date: Tue Feb 12 22:05:39 2008 +0100
Collect all init_lsa_string varients in one place.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source/Makefile.in | 4 +-
source/libnet/libnet_join.c | 5 --
source/rpc_client/cli_samr.c | 5 --
.../svc_winreg.c => rpc_client/init_lsa.c} | 57 +++++++------------
source/rpc_client/init_samr.c | 9 ---
source/rpc_server/srv_lsa_nt.c | 14 -----
source/rpc_server/srv_samr_nt.c | 18 ------
source/rpcclient/cmd_lsarpc.c | 5 --
source/rpcclient/cmd_samr.c | 5 --
source/utils/net_domain.c | 5 --
source/utils/net_rpc.c | 5 --
source/utils/net_rpc_join.c | 6 --
source/utils/net_rpc_rights.c | 5 --
13 files changed, 24 insertions(+), 119 deletions(-)
copy source/{services/svc_winreg.c => rpc_client/init_lsa.c} (53%)
Changeset truncated at 500 lines:
diff --git a/source/Makefile.in b/source/Makefile.in
index da5a6ca..4c1fef4 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -396,7 +396,9 @@ RPC_CLIENT_OBJ1 = rpc_client/cli_netlogon.o rpc_client/cli_srvsvc.o
LIBMSRPC_OBJ = rpc_client/cli_lsarpc.o rpc_client/cli_samr.o \
$(RPC_CLIENT_OBJ1) rpc_client/cli_reg.o $(RPC_CLIENT_OBJ) \
rpc_client/cli_spoolss.o rpc_client/cli_spoolss_notify.o \
- rpc_client/cli_svcctl.o rpc_client/init_samr.o
+ rpc_client/cli_svcctl.o \
+ rpc_client/init_samr.o \
+ rpc_client/init_lsa.o
LIBMSRPC_GEN_OBJ = librpc/gen_ndr/cli_lsa.o \
librpc/gen_ndr/cli_dfs.o \
diff --git a/source/libnet/libnet_join.c b/source/libnet/libnet_join.c
index 4b8826a..0543ca8 100644
--- a/source/libnet/libnet_join.c
+++ b/source/libnet/libnet_join.c
@@ -50,11 +50,6 @@
#define LIBNET_UNJOIN_OUT_DUMP_CTX(ctx, r) \
LIBNET_UNJOIN_DUMP_CTX(ctx, r, NDR_OUT)
-static void init_lsa_String(struct lsa_String *name, const char *s)
-{
- name->string = s;
-}
-
/****************************************************************
****************************************************************/
diff --git a/source/rpc_client/cli_samr.c b/source/rpc_client/cli_samr.c
index 2bf6e36..2bb837b 100644
--- a/source/rpc_client/cli_samr.c
+++ b/source/rpc_client/cli_samr.c
@@ -22,11 +22,6 @@
#include "includes.h"
-static void init_lsa_String(struct lsa_String *name, const char *s)
-{
- name->string = s;
-}
-
/* Enumerate domain groups */
NTSTATUS rpccli_samr_enum_dom_groups(struct rpc_pipe_client *cli,
diff --git a/source/services/svc_winreg.c b/source/rpc_client/init_lsa.c
similarity index 53%
copy from source/services/svc_winreg.c
copy to source/rpc_client/init_lsa.c
index 09d25f4..0af85c0 100644
--- a/source/services/svc_winreg.c
+++ b/source/rpc_client/init_lsa.c
@@ -1,63 +1,48 @@
-/*
+/*
* Unix SMB/CIFS implementation.
- * Service Control API Implementation
- * Copyright (C) Gerald Carter 2005.
- *
+ * RPC Pipe client / server routines
+ * Copyright (C) Guenther Deschner 2008.
+ *
* 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/>.
*/
#include "includes.h"
-/* Implementation for internal winreg service */
+/*******************************************************************
+ inits a structure.
+********************************************************************/
-/*********************************************************************
-*********************************************************************/
-
-static WERROR winreg_stop( const char *service, SERVICE_STATUS *service_status )
+void init_lsa_String(struct lsa_String *name, const char *s)
{
- return WERR_ACCESS_DENIED;
+ name->string = s;
}
-/*********************************************************************
-*********************************************************************/
+/*******************************************************************
+ inits a structure.
+********************************************************************/
-static WERROR winreg_start( const char *service )
+void init_lsa_StringLarge(struct lsa_StringLarge *name, const char *s)
{
- return WERR_ACCESS_DENIED;
+ name->string = s;
}
-/*********************************************************************
-*********************************************************************/
+/*******************************************************************
+ inits a structure.
+********************************************************************/
-static WERROR winreg_status( const char *service, SERVICE_STATUS *service_status )
+void init_lsa_AsciiString(struct lsa_AsciiString *name, const char *s)
{
- ZERO_STRUCTP( service_status );
-
- service_status->type = 0x20;
- service_status->controls_accepted = SVCCTL_ACCEPT_NONE;
- service_status->state = SVCCTL_RUNNING;
-
- return WERR_OK;
+ name->string = s;
}
-/*********************************************************************
-*********************************************************************/
-
-/* struct for svcctl control to manipulate winreg service */
-
-SERVICE_CONTROL_OPS winreg_svc_ops = {
- winreg_stop,
- winreg_start,
- winreg_status
-};
diff --git a/source/rpc_client/init_samr.c b/source/rpc_client/init_samr.c
index 0e22e77..1275fc8 100644
--- a/source/rpc_client/init_samr.c
+++ b/source/rpc_client/init_samr.c
@@ -23,15 +23,6 @@
inits a structure.
********************************************************************/
-static void init_lsa_String(struct lsa_String *name, const char *s)
-{
- name->string = s;
-}
-
-/*******************************************************************
- inits a structure.
-********************************************************************/
-
void init_samr_DomInfo1(struct samr_DomInfo1 *r,
uint16_t min_password_length,
uint16_t password_history_length,
diff --git a/source/rpc_server/srv_lsa_nt.c b/source/rpc_server/srv_lsa_nt.c
index 769dd8a..8041424 100644
--- a/source/rpc_server/srv_lsa_nt.c
+++ b/source/rpc_server/srv_lsa_nt.c
@@ -47,20 +47,6 @@ const struct generic_mapping lsa_generic_mapping = {
};
/*******************************************************************
- inits a structure.
-********************************************************************/
-
-static void init_lsa_StringLarge(struct lsa_StringLarge *name, const char *s)
-{
- name->string = s;
-}
-
-static void init_lsa_String(struct lsa_String *name, const char *s)
-{
- name->string = s;
-}
-
-/*******************************************************************
Function to free the per handle data.
********************************************************************/
diff --git a/source/rpc_server/srv_samr_nt.c b/source/rpc_server/srv_samr_nt.c
index 3e88f24..3637560 100644
--- a/source/rpc_server/srv_samr_nt.c
+++ b/source/rpc_server/srv_samr_nt.c
@@ -104,15 +104,6 @@ static const struct generic_mapping ali_generic_mapping = {
GENERIC_RIGHTS_ALIAS_ALL_ACCESS};
/*******************************************************************
- inits a structure.
-********************************************************************/
-
-static void init_lsa_String(struct lsa_String *name, const char *s)
-{
- name->string = s;
-}
-
-/*******************************************************************
*******************************************************************/
static NTSTATUS make_samr_object_sd( TALLOC_CTX *ctx, SEC_DESC **psd, size_t *sd_size,
@@ -1172,15 +1163,6 @@ NTSTATUS _samr_EnumDomainAliases(pipes_struct *p,
}
/*******************************************************************
- inits a structure.
-********************************************************************/
-
-static void init_lsa_AsciiString(struct lsa_AsciiString *name, const char *s)
-{
- name->string = s;
-}
-
-/*******************************************************************
inits a samr_DispInfoGeneral structure.
********************************************************************/
diff --git a/source/rpcclient/cmd_lsarpc.c b/source/rpcclient/cmd_lsarpc.c
index 2fe0683..4751adf 100644
--- a/source/rpcclient/cmd_lsarpc.c
+++ b/source/rpcclient/cmd_lsarpc.c
@@ -22,11 +22,6 @@
#include "includes.h"
#include "rpcclient.h"
-static void init_lsa_String(struct lsa_String *name, const char *s)
-{
- name->string = s;
-}
-
/* useful function to allow entering a name instead of a SID and
* looking it up automatically */
static NTSTATUS name_to_sid(struct rpc_pipe_client *cli,
diff --git a/source/rpcclient/cmd_samr.c b/source/rpcclient/cmd_samr.c
index 4fa5387..f8b8ba8 100644
--- a/source/rpcclient/cmd_samr.c
+++ b/source/rpcclient/cmd_samr.c
@@ -26,11 +26,6 @@
extern DOM_SID domain_sid;
-static void init_lsa_String(struct lsa_String *name, const char *s)
-{
- name->string = s;
-}
-
/****************************************************************************
display samr_user_info_7 structure
****************************************************************************/
diff --git a/source/utils/net_domain.c b/source/utils/net_domain.c
index 69994b5..90d28b5 100644
--- a/source/utils/net_domain.c
+++ b/source/utils/net_domain.c
@@ -37,11 +37,6 @@
goto done; \
}
-static void init_lsa_String(struct lsa_String *name, const char *s)
-{
- name->string = s;
-}
-
/*******************************************************************
Leave an AD domain. Windows XP disables the machine account.
We'll try the same. The old code would do an LDAP delete.
diff --git a/source/utils/net_rpc.c b/source/utils/net_rpc.c
index 968ae9d..4967eb4 100644
--- a/source/utils/net_rpc.c
+++ b/source/utils/net_rpc.c
@@ -23,11 +23,6 @@
#include "includes.h"
#include "utils/net.h"
-static void init_lsa_String(struct lsa_String *name, const char *s)
-{
- name->string = s;
-}
-
static int net_mode_share;
static bool sync_files(struct copy_clistate *cp_clistate, const char *mask);
diff --git a/source/utils/net_rpc_join.c b/source/utils/net_rpc_join.c
index a20dc9a..f08dc66 100644
--- a/source/utils/net_rpc_join.c
+++ b/source/utils/net_rpc_join.c
@@ -34,12 +34,6 @@
goto done; \
}
-static void init_lsa_String(struct lsa_String *name, const char *s)
-{
- name->string = s;
-}
-
-
/**
* confirm that a domain join is still valid
*
diff --git a/source/utils/net_rpc_rights.c b/source/utils/net_rpc_rights.c
index e110c41..de6e14e 100644
--- a/source/utils/net_rpc_rights.c
+++ b/source/utils/net_rpc_rights.c
@@ -19,11 +19,6 @@
#include "includes.h"
#include "utils/net.h"
-static void init_lsa_String(struct lsa_String *name, const char *s)
-{
- name->string = s;
-}
-
/********************************************************************
********************************************************************/
--
Samba Shared Repository
More information about the samba-cvs
mailing list