diff options
| author | Richard Lowe <richlowe@richlowe.net> | 2011-09-25 05:29:49 +0100 |
|---|---|---|
| committer | Richard Lowe <richlowe@richlowe.net> | 2011-09-25 05:29:49 +0100 |
| commit | d322ce9e5e9bb437d93bf09b5354eede23491de7 (patch) | |
| tree | 7a3cc5a877d01d51391e9f27a5a929aae8eda1e3 /usr/src/uts/common/gssapi | |
| parent | 2408d5be4d43f2c643cbcf11db3a58722a9153b2 (diff) | |
| parent | 2807a6ec36a80c58154d9929cf429e8d6100f20a (diff) | |
| download | illumos-joyent-d322ce9e5e9bb437d93bf09b5354eede23491de7.tar.gz | |
Merge remote-tracking branch 'illumos/master' into gcc/upgrade
Conflicts:
usr/src/common/dis/i386/dis_tables.c
Diffstat (limited to 'usr/src/uts/common/gssapi')
| -rw-r--r-- | usr/src/uts/common/gssapi/gssdmod.c | 5 | ||||
| -rw-r--r-- | usr/src/uts/common/gssapi/mechs/dummy/dmech.c | 5 | ||||
| -rw-r--r-- | usr/src/uts/common/gssapi/mechs/krb5/krb5mech.c | 5 |
3 files changed, 3 insertions, 12 deletions
diff --git a/usr/src/uts/common/gssapi/gssdmod.c b/usr/src/uts/common/gssapi/gssdmod.c index f47ae5c297..e41b44088b 100644 --- a/usr/src/uts/common/gssapi/gssdmod.c +++ b/usr/src/uts/common/gssapi/gssdmod.c @@ -22,17 +22,14 @@ /* * Copyright 2004 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright (c) 2011 Bayard G. Bell. All rights reserved. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/types.h> #include <sys/modctl.h> #include <sys/errno.h> #include <gssapi/kgssapi_defs.h> -char _depends_on[] = "strmod/rpcmod misc/rpcsec misc/tlimod"; - static struct modlmisc modlmisc = { &mod_miscops, "in-kernel GSSAPI" }; diff --git a/usr/src/uts/common/gssapi/mechs/dummy/dmech.c b/usr/src/uts/common/gssapi/mechs/dummy/dmech.c index 9adf29bc40..04f0949d24 100644 --- a/usr/src/uts/common/gssapi/mechs/dummy/dmech.c +++ b/usr/src/uts/common/gssapi/mechs/dummy/dmech.c @@ -22,10 +22,9 @@ /* * Copyright 2004 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright (c) 2011 Bayard G. Bell. All rights reserved. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * A module that implements a dummy security mechanism. * It's mainly used to test GSS-API application. Multiple tokens @@ -33,8 +32,6 @@ * specified through dummy_mech.conf located in /etc. */ -char _depends_on[] = "misc/kgssapi"; - #include <sys/types.h> #include <sys/modctl.h> #include <sys/errno.h> diff --git a/usr/src/uts/common/gssapi/mechs/krb5/krb5mech.c b/usr/src/uts/common/gssapi/mechs/krb5/krb5mech.c index cd93a6a8fb..00a8d7be18 100644 --- a/usr/src/uts/common/gssapi/mechs/krb5/krb5mech.c +++ b/usr/src/uts/common/gssapi/mechs/krb5/krb5mech.c @@ -21,15 +21,12 @@ /* * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright (c) 2011 Bayard G. Bell. All rights reserved. * * A module for Kerberos V5 security mechanism. * */ -#pragma ident "%Z%%M% %I% %E% SMI" - -char _depends_on[] = "misc/kgssapi crypto/md5"; - #include <sys/types.h> #include <sys/modctl.h> #include <sys/errno.h> |