summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--source3/Makefile.in4
-rw-r--r--source3/libnet/libnet_join.c5
-rw-r--r--source3/rpc_client/cli_samr.c5
-rw-r--r--source3/rpc_client/init_lsa.c48
-rw-r--r--source3/rpc_client/init_samr.c9
-rw-r--r--source3/rpc_server/srv_lsa_nt.c14
-rw-r--r--source3/rpc_server/srv_samr_nt.c18
-rw-r--r--source3/rpcclient/cmd_lsarpc.c5
-rw-r--r--source3/rpcclient/cmd_samr.c5
-rw-r--r--source3/utils/net_domain.c5
-rw-r--r--source3/utils/net_rpc.c5
-rw-r--r--source3/utils/net_rpc_join.c6
-rw-r--r--source3/utils/net_rpc_rights.c5
13 files changed, 51 insertions, 83 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index da5a6ca489..4c1fef4be3 100644
--- a/source3/Makefile.in
+++ b/source3/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/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index 4b8826ac97..0543ca8474 100644
--- a/source3/libnet/libnet_join.c
+++ b/source3/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/source3/rpc_client/cli_samr.c b/source3/rpc_client/cli_samr.c
index 2bf6e3698a..2bb837bac8 100644
--- a/source3/rpc_client/cli_samr.c
+++ b/source3/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/source3/rpc_client/init_lsa.c b/source3/rpc_client/init_lsa.c
new file mode 100644
index 0000000000..0af85c0373
--- /dev/null
+++ b/source3/rpc_client/init_lsa.c
@@ -0,0 +1,48 @@
+/*
+ * Unix SMB/CIFS implementation.
+ * 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"
+
+/*******************************************************************
+ inits a structure.
+********************************************************************/
+
+void init_lsa_String(struct lsa_String *name, const char *s)
+{
+ name->string = s;
+}
+
+/*******************************************************************
+ inits a structure.
+********************************************************************/
+
+void init_lsa_StringLarge(struct lsa_StringLarge *name, const char *s)
+{
+ name->string = s;
+}
+
+/*******************************************************************
+ inits a structure.
+********************************************************************/
+
+void init_lsa_AsciiString(struct lsa_AsciiString *name, const char *s)
+{
+ name->string = s;
+}
+
diff --git a/source3/rpc_client/init_samr.c b/source3/rpc_client/init_samr.c
index 0e22e77b65..1275fc834b 100644
--- a/source3/rpc_client/init_samr.c
+++ b/source3/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/source3/rpc_server/srv_lsa_nt.c b/source3/rpc_server/srv_lsa_nt.c
index 769dd8ad57..8041424627 100644
--- a/source3/rpc_server/srv_lsa_nt.c
+++ b/source3/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/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index 3e88f24ea2..3637560a7f 100644
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/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/source3/rpcclient/cmd_lsarpc.c b/source3/rpcclient/cmd_lsarpc.c
index 2fe06831f3..4751adfa52 100644
--- a/source3/rpcclient/cmd_lsarpc.c
+++ b/source3/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/source3/rpcclient/cmd_samr.c b/source3/rpcclient/cmd_samr.c
index 4fa5387d61..f8b8ba893c 100644
--- a/source3/rpcclient/cmd_samr.c
+++ b/source3/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/source3/utils/net_domain.c b/source3/utils/net_domain.c
index 69994b53df..90d28b5e6e 100644
--- a/source3/utils/net_domain.c
+++ b/source3/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/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index 968ae9d9b5..4967eb4cff 100644
--- a/source3/utils/net_rpc.c
+++ b/source3/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/source3/utils/net_rpc_join.c b/source3/utils/net_rpc_join.c
index a20dc9a0c4..f08dc66d3c 100644
--- a/source3/utils/net_rpc_join.c
+++ b/source3/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/source3/utils/net_rpc_rights.c b/source3/utils/net_rpc_rights.c
index e110c412e0..de6e14ebad 100644
--- a/source3/utils/net_rpc_rights.c
+++ b/source3/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;
-}
-
/********************************************************************
********************************************************************/
generated by cgit (git 2.34.1) at 2024-11-10 03:49:07 +0000