s3-dcerpc: move crypto stuff in /librpc/crypto

Signed-off-by: Günther Deschner <gd@samba.org>

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 2f32251fb139813622573f3fe34b4d19a2a5754c..6beced258023911006f7600b60e55791f3b1e877 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -593,8 +593,8 @@ LIBSMB_OBJ = libsmb/clientgen.o libsmb/cliconnect.o libsmb/clifile.o \
 
 LIBMSRPC_OBJ = $(SCHANNEL_OBJ) \
               rpc_client/cli_pipe.o \
-              librpc/rpc/dcerpc_krb5.o \
-              librpc/rpc/dcerpc_gssapi.o \
+              librpc/crypto/gse_krb5.o \
+              librpc/crypto/gse.o \
               librpc/rpc/dcerpc_spnego.o \
               librpc/rpc/rpc_common.o \
               rpc_client/rpc_transport_np.o \

diff --git a/source3/librpc/rpc/dcerpc_gssapi.c b/source3/librpc/crypto/gse.c
similarity index 99%
rename from source3/librpc/rpc/dcerpc_gssapi.c
rename to source3/librpc/crypto/gse.c
index 2918cfdf8f1e84b9ee0da207f2a16bc59eb29c9d..c12656b0fad89c4169d5c82fa6aea655e9e8a60f 100644 (file)
--- a/source3/librpc/rpc/dcerpc_gssapi.c
+++ b/source3/librpc/crypto/gse.c
@@ -20,12 +20,12 @@
 /* We support only GSSAPI/KRB5 here */
 
 #include "includes.h"
-#include "dcerpc_gssapi.h"
+#include "gse.h"
 
 #if defined(HAVE_KRB5) && defined(HAVE_GSSAPI_GSSAPI_EXT_H) && defined(HAVE_GSS_WRAP_IOV)
 
 #include "smb_krb5.h"
-#include "dcerpc_krb5.h"
+#include "gse_krb5.h"
 
 #include <gssapi/gssapi.h>
 #include <gssapi/gssapi_krb5.h>
@@ -378,7 +378,7 @@ NTSTATUS gse_init_server(TALLOC_CTX *mem_ctx,
        }
 
        if (!keytab_name) {
-               ret = smb_krb5_get_server_keytab(gse_ctx->k5ctx,
+               ret = gse_krb5_get_server_keytab(gse_ctx->k5ctx,
                                                 &gse_ctx->keytab);
                if (ret) {
                        status = NT_STATUS_INTERNAL_ERROR;

diff --git a/source3/librpc/rpc/dcerpc_gssapi.h b/source3/librpc/crypto/gse.h
similarity index 96%
rename from source3/librpc/rpc/dcerpc_gssapi.h
rename to source3/librpc/crypto/gse.h
index 0ffed2c457155609dc5672e71f7366a51308ad4f..6f8b6735ad20b028052172b18970be1ad1281cd2 100644 (file)
--- a/source3/librpc/rpc/dcerpc_gssapi.h
+++ b/source3/librpc/crypto/gse.h
@@ -17,8 +17,8 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _CLI_PIPE_GSSAPI_H_
-#define _CLI_PIPE_GSSAPI_H_
+#ifndef _GSE_H_
+#define _GSE_H_
 
 struct gse_context;
 
@@ -73,4 +73,5 @@ NTSTATUS gse_sign(TALLOC_CTX *mem_ctx, struct gse_context *gse_ctx,
                  DATA_BLOB *data, DATA_BLOB *signature);
 NTSTATUS gse_sigcheck(TALLOC_CTX *mem_ctx, struct gse_context *gse_ctx,
                      DATA_BLOB *data, DATA_BLOB *signature);
-#endif /* _CLI_PIPE_GSSAPI_H_ */
+
+#endif /* _GSE_H_ */

diff --git a/source3/librpc/rpc/dcerpc_krb5.c b/source3/librpc/crypto/gse_krb5.c
similarity index 98%
rename from source3/librpc/rpc/dcerpc_krb5.c
rename to source3/librpc/crypto/gse_krb5.c
index 22443b63ff82ef5c2841c12b30c375c83af78caa..735dff059e954aa5776d049b54664c2df66cd581 100644 (file)
--- a/source3/librpc/rpc/dcerpc_krb5.c
+++ b/source3/librpc/crypto/gse_krb5.c
@@ -20,7 +20,7 @@
 #include "includes.h"
 #include "smb_krb5.h"
 #include "secrets.h"
-#include "librpc/rpc/dcerpc_krb5.h"
+#include "gse_krb5.h"
 
 #ifdef HAVE_KRB5
 
@@ -348,7 +348,7 @@ static krb5_error_code get_mem_keytab_from_system_keytab(krb5_context krbctx,
        return KRB5_KT_NOTFOUND;
 }
 
-krb5_error_code smb_krb5_get_server_keytab(krb5_context krbctx,
+krb5_error_code gse_krb5_get_server_keytab(krb5_context krbctx,
                                           krb5_keytab *keytab)
 {
        krb5_error_code ret;

diff --git a/source3/librpc/rpc/dcerpc_krb5.h b/source3/librpc/crypto/gse_krb5.h
similarity index 85%
rename from source3/librpc/rpc/dcerpc_krb5.h
rename to source3/librpc/crypto/gse_krb5.h
index c5d7dd6a09fc88db1460ea521553860cccba1666..ea789c947a8397f544807001dcc6d81c175d7db7 100644 (file)
--- a/source3/librpc/rpc/dcerpc_krb5.h
+++ b/source3/librpc/crypto/gse_krb5.h
@@ -17,14 +17,14 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _DCERPC_KRB5_H_
-#define _DCERPC_KRB5_H_
+#ifndef _GSE_KRB5_H_
+#define _GSE_KRB5_H_
 
 #ifdef HAVE_KRB5
 
-krb5_error_code smb_krb5_get_server_keytab(krb5_context krbctx,
+krb5_error_code gse_krb5_get_server_keytab(krb5_context krbctx,
                                           krb5_keytab *keytab);
 
 #endif /* HAVE_KRB5 */
 
-#endif /* _DCERPC_KRB5_H_ */
+#endif /* _GSE_KRB5_H_ */

diff --git a/source3/librpc/rpc/dcerpc_helpers.c b/source3/librpc/rpc/dcerpc_helpers.c
index b658579d19039085d11edf29b4c1ce717e3328e8..8944b395d8e254053de7c4f4f14deab879ff0342 100644 (file)
--- a/source3/librpc/rpc/dcerpc_helpers.c
+++ b/source3/librpc/rpc/dcerpc_helpers.c
@@ -26,7 +26,7 @@
 #include "../libcli/auth/spnego.h"
 #include "../libcli/auth/ntlmssp.h"
 #include "ntlmssp_wrap.h"
-#include "librpc/rpc/dcerpc_gssapi.h"
+#include "librpc/crypto/gse.h"
 #include "librpc/rpc/dcerpc_spnego.h"
 
 #undef DBGC_CLASS

diff --git a/source3/librpc/rpc/dcerpc_spnego.c b/source3/librpc/rpc/dcerpc_spnego.c
index ec81a2c70180611d9d01b5a9bc6c5a766d21f05a..9ea2a561da986de3b6783c684cdfd6bec0b2d2e5 100644 (file)
--- a/source3/librpc/rpc/dcerpc_spnego.c
+++ b/source3/librpc/rpc/dcerpc_spnego.c
@@ -22,7 +22,7 @@
 #include "include/ntlmssp_wrap.h"
 #include "librpc/gen_ndr/ntlmssp.h"
 #include "dcerpc_spnego.h"
-#include "dcerpc_gssapi.h"
+#include "librpc/crypto/gse.h"
 
 struct spnego_context {
        enum dcerpc_AuthType auth_type;

diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index d8bed84e2da2cf32655ba2bb1af48a7d19e3c03c..21f7c4bf31e11a24b685c49aed8afd3f8fdcd722 100644 (file)
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -29,7 +29,7 @@
 #include "ntlmssp_wrap.h"
 #include "librpc/gen_ndr/ndr_dcerpc.h"
 #include "librpc/rpc/dcerpc.h"
-#include "librpc/rpc/dcerpc_gssapi.h"
+#include "librpc/crypto/gse.h"
 #include "librpc/rpc/dcerpc_spnego.h"
 #include "rpc_dce.h"
 

diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c
index 767f851b2ce7a98ee40b627336ab9222d69a980d..4a159ce99724a9f0978f2c3e22d75d6018189aad 100644 (file)
--- a/source3/rpc_server/srv_pipe.c
+++ b/source3/rpc_server/srv_pipe.c
@@ -37,7 +37,7 @@
 #include "ntlmssp_wrap.h"
 #include "rpc_server.h"
 #include "rpc_dce.h"
-#include "librpc/rpc/dcerpc_gssapi.h"
+#include "librpc/crypto/gse.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV