[Heimdal-source-changes] [Heimdal] branch master updated. heimdal-1.5pre2-739-gb0b94a4
lha at h5l.org
lha at h5l.org
Tors Sep 27 23:01:34 CEST 2012
The branch master has been updated
via b0b94a4 Add pkg-config files for krb5 libraries
via 9ba23d7 guess some code for SUN_PROC_POINT
from db85d09 include <stddef.h> so that we have a size_t
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 9ba23d7da873929924567d1b9f8ff03543bd496b
Author: Love Hornquist Astrand <lha at h5l.org>
Date: Mon Sep 24 21:28:04 2012 -0700
guess some code for SUN_PROC_POINT
9ba23d7da873929924567d1b9f8ff03543bd496b
diff --git a/lib/kafs/afssys.c b/lib/kafs/afssys.c
index ba492ff..fe37c34 100644
--- a/lib/kafs/afssys.c
+++ b/lib/kafs/afssys.c
@@ -65,6 +65,32 @@ struct devdata {
#define VIOC_SYSCALL_DEV_OPENAFS _IOWR('C', 1, struct devdata)
#endif
+#ifdef _IOW
+#ifdef _ILP32
+struct sundevdata {
+ uint32_t param6;
+ uint32_t param5;
+ uint32_t param4;
+ uint32_t param3;
+ uint32_t param2;
+ uint32_t param1;
+ uint32_t syscall;
+};
+#define VIOC_SUN_SYSCALL_DEV _IOW('C', 2, struct sundevdata)
+#else
+struct sundevdata {
+ uint64_t param6;
+ uint64_t param5;
+ uint64_t param4;
+ uint64_t param3;
+ uint64_t param2;
+ uint64_t param1;
+ uint64_t syscall;
+};
+#define VIOC_SUN_SYSCALL_DEV _IOW('C', 1, struct sundevdata)
+#endif
+#endif /* _IOW */
+
int _kafs_debug; /* this should be done in a better way */
@@ -77,6 +103,7 @@ int _kafs_debug; /* this should be done in a better way */
#define LINUX_PROC_POINT 5
#define AIX_ENTRY_POINTS 6
#define MACOS_DEV_POINT 7
+#define SUN_PROC_POINT 8
static int afs_entry_point = UNKNOWN_ENTRY_POINT;
static int afs_syscalls[2];
@@ -192,6 +219,12 @@ try_ioctlpath(const char *path, unsigned long ioctlnum, int entrypoint)
ret = ioctl(fd, ioctlnum, &data);
break;
}
+ case SUN_PROC_POINT: {
+ struct sundevdata data = { 0, 0, 0, 0, 0, 0, AFSCALL_PIOCTL };
+ data.param2 = (unsigned long)VIOCGETTOK;
+ ret = ioctl(fd, ioctlnum, &data);
+ break;
+ }
default:
abort();
}
@@ -273,6 +306,14 @@ k_pioctl(char *a_path,
return data.retval;
}
+ case SUN_PROC_POINT: {
+ struct sundevdata data = { 0, 0, 0, 0, 0, 0, AFSCALL_PIOCTL };
+ data.param1 = (unsigned long)a_path;
+ data.param2 = (unsigned long)o_opcode;
+ data.param3 = (unsigned long)a_paramsP;
+ data.param4 = (unsigned long)a_followSymlinks;
+ return do_ioctl(&data);
+ }
#ifdef _AIX
case AIX_ENTRY_POINTS:
return Pioctl(a_path, o_opcode, a_paramsP, a_followSymlinks);
@@ -331,6 +372,10 @@ k_setpag(void)
return ret;
return data.retval;
}
+ case SUN_PROC_POINT: {
+ struct sundevdata data = { 0, 0, 0, 0, 0, 0, AFSCALL_SETPAG };
+ return do_ioctl(&data);
+ }
#ifdef _AIX
case AIX_ENTRY_POINTS:
return Setpag();
@@ -478,6 +523,12 @@ k_hasafs(void)
if (ret == 0)
goto done;
#endif
+#ifdef VIOC_SUN_SYSCALL_DEV
+ ret = try_ioctlpath("/dev/afs", VIOC_SUN_SYSCALL_DEV, SUN_PROC_POINT);
+ if (ret == 0)
+ goto done;
+#endif
+
#if defined(AFS_SYSCALL) || defined(AFS_SYSCALL2) || defined(AFS_SYSCALL3)
{
-----------------------------------------------------------------------
commit b0b94a445a4283843772c3a4d525e10ba2a98924
Author: Stef Walter <stefw at gnome.org>
Date: Thu Sep 27 13:51:27 2012 +0200
Add pkg-config files for krb5 libraries
* These can be used along side krb5-config
Signed-off-by: Love Hornquist Astrand <lha at h5l.org>
b0b94a445a4283843772c3a4d525e10ba2a98924
diff --git a/cf/Makefile.am.common b/cf/Makefile.am.common
index f69b86f..9862060 100644
--- a/cf/Makefile.am.common
+++ b/cf/Makefile.am.common
@@ -1,6 +1,6 @@
# $Id$
-SUFFIXES = .et .h
+SUFFIXES = .et .h .pc.in .pc
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 36eed71..e872b3f 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -6,7 +6,13 @@ bin_SCRIPTS = krb5-config
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = heimdal-gssapi.pc
+pkgconfig_DATA = \
+ heimdal-gssapi.pc \
+ kafs.pc \
+ kadm-client.pc \
+ kadm-server.pc \
+ krb5.pc \
+ krb5-gssapi.pc
man_MANS = krb5-config.1
@@ -35,8 +41,8 @@ krb5-config: krb5-config.in
mv $@.new $@
chmod +x $@
-heimdal-gssapi.pc: heimdal-gssapi.pc.in
- $(subst) $(srcdir)/heimdal-gssapi.pc.in > $@.new
+.pc.in.pc:
+ $(subst) $< > $@.new
mv $@.new $@
EXTRA_DIST = \
diff --git a/tools/heimdal-gssapi.pc.in b/tools/heimdal-gssapi.pc.in
index 1d8f235..e053003 100644
--- a/tools/heimdal-gssapi.pc.in
+++ b/tools/heimdal-gssapi.pc.in
@@ -8,7 +8,6 @@ Name: @PACKAGE@
Description: Heimdal is an implementation of Kerberos 5, freely available under a three clause BSD style license.
Version: @VERSION@
URL: http://www.pdc.kth.se/heimdal/
-#Requires: foo = 1.3.1
-#Conflicts: bar <= 4.5
-Libs: -L${libdir} -lgssapi -lheimntlm -lkrb5 @LIB_pkinit@ -lcom_err @LIB_hcrypto_appl@ -lasn1 -lwind -lroken @LIB_crypt@ @LIB_dlopen@ @LIB_door_create@ @LIBS@
+Requires: krb5
+Libs: -L${libdir} -lgssapi -lheimntlm @LIB_crypt@
Cflags: -I${includedir}
diff --git a/tools/kadm-client.pc.in b/tools/kadm-client.pc.in
new file mode 100644
index 0000000..7197941
--- /dev/null
+++ b/tools/kadm-client.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: kadm-client
+Description: Kadmin client library.
+Version: @VERSION@
+Requires: krb5-gssapi
+Libs: -lkadm5clnt
diff --git a/tools/kadm-server.pc.in b/tools/kadm-server.pc.in
new file mode 100644
index 0000000..d134ca7
--- /dev/null
+++ b/tools/kadm-server.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: kadm-server
+Description: Kadmin server library.
+Version: @VERSION@
+Requires: krb5-gssapi
+Libs: -lkadm5srv @LIB_dbopen@
diff --git a/tools/kafs.pc.in b/tools/kafs.pc.in
new file mode 100644
index 0000000..e45fabc
--- /dev/null
+++ b/tools/kafs.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: kafs
+Description: Libraries for application that uses kafs.
+Version: @VERSION@
+Requires: krb5
+Libs: -lkafs
diff --git a/tools/krb5-gssapi.pc.in b/tools/krb5-gssapi.pc.in
new file mode 100644
index 0000000..482b78f
--- /dev/null
+++ b/tools/krb5-gssapi.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+vendor=Heimdal
+
+Name: krb5-gssapi
+Description: Kerberos implementation of the GSS API.
+Version: @VERSION@
+Requires: heimdal-gssapi
diff --git a/tools/krb5.pc.in b/tools/krb5.pc.in
new file mode 100644
index 0000000..4e6c277
--- /dev/null
+++ b/tools/krb5.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+vendor=Heimdal
+
+Name: krb5
+Description: Heimdal implementation of the kerberos network authentication.
+Version: @VERSION@
+Libs: -L${libdir} -lkrb5 @LIB_pkinit@ -lcom_err @LIB_hcrypto_appl@ -lasn1 -lwind -lheimbase -lroken @LIB_crypt@ @PTHREAD_LIBADD@ @LIB_dlopen@ @LIB_door_create@ @LIBS@
+Cflags: -I${includedir}
-----------------------------------------------------------------------
Summary of changes:
cf/Makefile.am.common | 2 +-
lib/kafs/afssys.c | 51 ++++++++++++++++++++++++++++++++++++++++++++
tools/Makefile.am | 12 +++++++--
tools/heimdal-gssapi.pc.in | 5 +--
tools/kadm-client.pc.in | 10 ++++++++
tools/kadm-server.pc.in | 10 ++++++++
tools/kafs.pc.in | 10 ++++++++
tools/krb5-gssapi.pc.in | 10 ++++++++
tools/krb5.pc.in | 11 +++++++++
9 files changed, 114 insertions(+), 7 deletions(-)
More information about the Heimdal-source-changes
mailing list