summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2010-05-17 23:27:30 +0200
committerGünther Deschner <gd@samba.org>2010-05-18 00:44:27 +0200
commit26c844902c70ea73f43f8e900344c25fb21e607c (patch)
treebdbf35d720aea5f7b3fded77ceeda262abb6507c
parent657fd0be1d9e878e98ff9eb79d845a5b6f974cd4 (diff)
downloadsamba-26c844902c70ea73f43f8e900344c25fb21e607c.tar.gz
samba-26c844902c70ea73f43f8e900344c25fb21e607c.tar.bz2
samba-26c844902c70ea73f43f8e900344c25fb21e607c.zip
s3-samr: move samr helper prototypes outside of proto.h
Guenther
-rw-r--r--source3/include/proto.h40
-rw-r--r--source3/rpc_server/srv_samr_nt.c1
-rw-r--r--source3/rpc_server/srv_samr_util.c1
-rw-r--r--source3/rpc_server/srv_samr_util.h63
4 files changed, 65 insertions, 40 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 27fa1b5514..8735b9aa78 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5716,46 +5716,6 @@ struct tevent_req *np_read_send(TALLOC_CTX *mem_ctx, struct event_context *ev,
NTSTATUS np_read_recv(struct tevent_req *req, ssize_t *nread,
bool *is_data_outstanding);
-/* The following definitions come from rpc_server/srv_samr_util.c */
-
-void copy_id2_to_sam_passwd(struct samu *to,
- struct samr_UserInfo2 *from);
-void copy_id4_to_sam_passwd(struct samu *to,
- struct samr_UserInfo4 *from);
-void copy_id6_to_sam_passwd(struct samu *to,
- struct samr_UserInfo6 *from);
-void copy_id8_to_sam_passwd(struct samu *to,
- struct samr_UserInfo8 *from);
-void copy_id10_to_sam_passwd(struct samu *to,
- struct samr_UserInfo10 *from);
-void copy_id11_to_sam_passwd(struct samu *to,
- struct samr_UserInfo11 *from);
-void copy_id12_to_sam_passwd(struct samu *to,
- struct samr_UserInfo12 *from);
-void copy_id13_to_sam_passwd(struct samu *to,
- struct samr_UserInfo13 *from);
-void copy_id14_to_sam_passwd(struct samu *to,
- struct samr_UserInfo14 *from);
-void copy_id16_to_sam_passwd(struct samu *to,
- struct samr_UserInfo16 *from);
-void copy_id17_to_sam_passwd(struct samu *to,
- struct samr_UserInfo17 *from);
-void copy_id18_to_sam_passwd(struct samu *to,
- struct samr_UserInfo18 *from);
-void copy_id20_to_sam_passwd(struct samu *to,
- struct samr_UserInfo20 *from);
-void copy_id21_to_sam_passwd(const char *log_prefix,
- struct samu *to,
- struct samr_UserInfo21 *from);
-void copy_id23_to_sam_passwd(struct samu *to,
- struct samr_UserInfo23 *from);
-void copy_id24_to_sam_passwd(struct samu *to,
- struct samr_UserInfo24 *from);
-void copy_id25_to_sam_passwd(struct samu *to,
- struct samr_UserInfo25 *from);
-void copy_id26_to_sam_passwd(struct samu *to,
- struct samr_UserInfo26 *from);
-
/* The following definitions come from rpc_server/srv_spoolss_nt.c */
void do_drv_upgrade_printer(struct messaging_context *msg,
diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index 70c162be9d..5e786a0404 100644
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -35,6 +35,7 @@
#include "smbd/globals.h"
#include "../libcli/auth/libcli_auth.h"
#include "../librpc/gen_ndr/srv_samr.h"
+#include "rpc_server/srv_samr_util.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_RPC_SRV
diff --git a/source3/rpc_server/srv_samr_util.c b/source3/rpc_server/srv_samr_util.c
index 1e5988af33..d456486a10 100644
--- a/source3/rpc_server/srv_samr_util.c
+++ b/source3/rpc_server/srv_samr_util.c
@@ -23,6 +23,7 @@
*/
#include "includes.h"
+#include "rpc_server/srv_samr_util.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_RPC_SRV
diff --git a/source3/rpc_server/srv_samr_util.h b/source3/rpc_server/srv_samr_util.h
new file mode 100644
index 0000000000..9dbc8b5ad6
--- /dev/null
+++ b/source3/rpc_server/srv_samr_util.h
@@ -0,0 +1,63 @@
+/*
+ Unix SMB/CIFS implementation.
+ SAMR Pipe utility functions.
+
+ Copyright (C) Luke Kenneth Casson Leighton 1996-1998
+ Copyright (C) Gerald (Jerry) Carter 2000-2001
+ Copyright (C) Andrew Bartlett 2001-2002
+ Copyright (C) Stefan (metze) Metzmacher 2002
+ 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/>.
+*/
+
+/* The following definitions come from rpc_server/srv_samr_util.c */
+
+void copy_id2_to_sam_passwd(struct samu *to,
+ struct samr_UserInfo2 *from);
+void copy_id4_to_sam_passwd(struct samu *to,
+ struct samr_UserInfo4 *from);
+void copy_id6_to_sam_passwd(struct samu *to,
+ struct samr_UserInfo6 *from);
+void copy_id8_to_sam_passwd(struct samu *to,
+ struct samr_UserInfo8 *from);
+void copy_id10_to_sam_passwd(struct samu *to,
+ struct samr_UserInfo10 *from);
+void copy_id11_to_sam_passwd(struct samu *to,
+ struct samr_UserInfo11 *from);
+void copy_id12_to_sam_passwd(struct samu *to,
+ struct samr_UserInfo12 *from);
+void copy_id13_to_sam_passwd(struct samu *to,
+ struct samr_UserInfo13 *from);
+void copy_id14_to_sam_passwd(struct samu *to,
+ struct samr_UserInfo14 *from);
+void copy_id16_to_sam_passwd(struct samu *to,
+ struct samr_UserInfo16 *from);
+void copy_id17_to_sam_passwd(struct samu *to,
+ struct samr_UserInfo17 *from);
+void copy_id18_to_sam_passwd(struct samu *to,
+ struct samr_UserInfo18 *from);
+void copy_id20_to_sam_passwd(struct samu *to,
+ struct samr_UserInfo20 *from);
+void copy_id21_to_sam_passwd(const char *log_prefix,
+ struct samu *to,
+ struct samr_UserInfo21 *from);
+void copy_id23_to_sam_passwd(struct samu *to,
+ struct samr_UserInfo23 *from);
+void copy_id24_to_sam_passwd(struct samu *to,
+ struct samr_UserInfo24 *from);
+void copy_id25_to_sam_passwd(struct samu *to,
+ struct samr_UserInfo25 *from);
+void copy_id26_to_sam_passwd(struct samu *to,
+ struct samr_UserInfo26 *from);