summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2012-05-21 18:24:31 +0200
committerAlexander Bokovoy <ab@samba.org>2012-05-23 17:51:51 +0300
commit0a6e568344adb66e5f20ce61f106d791886fcb35 (patch)
tree06cb665b5b9139243ce8059a7bedb29f7ae11503
parentc1444c3839573793c24244da8572e6c8468c927f (diff)
downloadsamba-0a6e568344adb66e5f20ce61f106d791886fcb35.tar.gz
samba-0a6e568344adb66e5f20ce61f106d791886fcb35.tar.bz2
samba-0a6e568344adb66e5f20ce61f106d791886fcb35.zip
krb5samba: Add smb_gss_oid_equal wrapper.
Signed-off-by: Andreas Schneider <asn@samba.org>
-rw-r--r--lib/krb5_wrap/gss_samba.c51
-rw-r--r--lib/krb5_wrap/gss_samba.h36
-rwxr-xr-xlib/krb5_wrap/wscript_build4
-rw-r--r--source3/Makefile.in1
4 files changed, 90 insertions, 2 deletions
diff --git a/lib/krb5_wrap/gss_samba.c b/lib/krb5_wrap/gss_samba.c
new file mode 100644
index 0000000000..b444633e28
--- /dev/null
+++ b/lib/krb5_wrap/gss_samba.c
@@ -0,0 +1,51 @@
+/*
+ * Unix SMB/CIFS implementation.
+ *
+ * Simple GSSAPI wrappers
+ *
+ * Copyright (c) 2012 Andreas Schneider <asn@samba.org>
+ *
+ * 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"
+#include "gss_samba.h"
+
+#ifdef HAVE_GSSAPI
+
+#if !defined(HAVE_GSS_OID_EQUAL)
+int smb_gss_oid_equal(const gss_OID first_oid, const gss_OID second_oid)
+{
+ if (first_oid == GSS_C_NO_OID || second_oid == GSS_C_NO_OID) {
+ return 0;
+ }
+
+ if (first_oid == second_oid) {
+ return 1;
+ }
+
+ if ((first_oid)->length != (second_oid)->length) {
+ return 0;
+ }
+
+ if (memcmp((first_oid)->elements, (second_oid)->elements,
+ (first_oid)->length) == 0) {
+ return 1;
+ }
+
+ return 0;
+}
+#endif /* !HAVE_GSS_OID_EQUAL */
+
+#endif /* HAVE_GSSAPI */
diff --git a/lib/krb5_wrap/gss_samba.h b/lib/krb5_wrap/gss_samba.h
new file mode 100644
index 0000000000..531993263b
--- /dev/null
+++ b/lib/krb5_wrap/gss_samba.h
@@ -0,0 +1,36 @@
+/*
+ * Unix SMB/CIFS implementation.
+ *
+ * Simple GSSAPI wrappers
+ *
+ * Copyright (c) 2012 Andreas Schneider <asn@samba.org>
+ *
+ * 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/>.
+ */
+
+#ifndef _GSS_SAMBA_H
+#define _GSS_SAMBA_H
+
+#ifdef HAVE_GSSAPI
+
+#include "system/gssapi.h"
+
+#if defined(HAVE_GSS_OID_EQUAL)
+#define smb_gss_oid_equal gss_oid_equal
+#else
+int smb_gss_oid_equal(const gss_OID first_oid, const gss_OID second_oid);
+#endif /* HAVE_GSS_OID_EQUAL */
+
+#endif /* HAVE_GSSAPI */
+#endif /* _GSS_SAMBA_H */
diff --git a/lib/krb5_wrap/wscript_build b/lib/krb5_wrap/wscript_build
index f5190bc001..961a0a44c4 100755
--- a/lib/krb5_wrap/wscript_build
+++ b/lib/krb5_wrap/wscript_build
@@ -5,7 +5,7 @@ if bld.CONFIG_SET('SAMBA4_USES_HEIMDAL'):
add_deps = ' asn1'
bld.SAMBA_LIBRARY('krb5samba',
- source='krb5_samba.c keytab_util.c',
- deps='samba-util asn1util talloc krb5 com_err' + add_deps,
+ source='krb5_samba.c gss_samba.c keytab_util.c',
+ deps='samba-util asn1util talloc krb5 com_err gssapi' + add_deps,
private_library=True
)
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 81e72646fe..e289252417 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -645,6 +645,7 @@ LIBMSRPC_OBJ = $(SCHANNEL_OBJ) \
librpc/crypto/gse_krb5.o \
librpc/crypto/gse.o \
../auth/kerberos/gssapi_pac.o \
+ ../lib/krb5_wrap/gss_samba.o \
librpc/rpc/rpc_common.o \
rpc_client/rpc_transport_np.o \
rpc_client/rpc_transport_sock.o \