diff options
| author |   hin <hin@openbsd.org> | 2003-05-11 04:12:44 +0000 |
|---|---|---|
| committer | hin <hin@openbsd.org> | 2003-05-11 04:12:44 +0000 |
| commit | 26c2a3b82a36378cd46a94d98520ebca9d878bed (patch) | |
| tree | c0ac42f6f1269d64d5a9e500504e5cf179f6ab6b | |
| parent | These files do not belong in kadmin client (diff) | |
| download | wireguard-openbsd-26c2a3b82a36378cd46a94d98520ebca9d878bed.tar.xz wireguard-openbsd-26c2a3b82a36378cd46a94d98520ebca9d878bed.zip | |
Fix a few merge mistakes
| -rw-r--r-- | kerberosV/src/appl/afsutil/afslog.c | 4 | ||||
| -rw-r--r-- | kerberosV/src/kdc/config.c | 3 | ||||
| -rw-r--r-- | kerberosV/src/lib/kafs/common.c | 4 | ||||
| -rw-r--r-- | kerberosV/src/lib/krb5/transited.c | 1 |
4 files changed, 3 insertions, 9 deletions
diff --git a/kerberosV/src/appl/afsutil/afslog.c b/kerberosV/src/appl/afsutil/afslog.c index d922a7fc4f3..7eefc10b700 100644 --- a/kerberosV/src/appl/afsutil/afslog.c +++ b/kerberosV/src/appl/afsutil/afslog.c @@ -33,7 +33,7 @@ #ifdef HAVE_CONFIG_H #include <config.h> -RCSID("$Id: afslog.c,v 1.4 2003/05/11 03:39:59 hin Exp $"); +RCSID("$Id: afslog.c,v 1.5 2003/05/11 04:12:44 hin Exp $"); #endif #include <ctype.h> #ifdef KRB5 @@ -116,8 +116,10 @@ expand_cell_name(const char *cell) const char *c; const char **fn, *files[] = { _PATH_CELLSERVDB, _PATH_ARLA_CELLSERVDB, +#if 0 _PATH_OPENAFS_DEBIAN_CELLSERVDB, _PATH_ARLA_DEBIAN_CELLSERVDB, +#endif NULL }; for(fn = files; *fn; fn++) { f = fopen(*fn, "r"); diff --git a/kerberosV/src/kdc/config.c b/kerberosV/src/kdc/config.c index 50df7c4e096..93797ac5c51 100644 --- a/kerberosV/src/kdc/config.c +++ b/kerberosV/src/kdc/config.c @@ -76,9 +76,6 @@ int enable_v4_cross_realm = -1; int enable_kaserver = -1; #endif -int enable_524 = -1; -int enable_v4_cross_realm = -1; - static int help_flag; static int version_flag; diff --git a/kerberosV/src/lib/kafs/common.c b/kerberosV/src/lib/kafs/common.c index 52db70f373d..49c74650536 100644 --- a/kerberosV/src/lib/kafs/common.c +++ b/kerberosV/src/lib/kafs/common.c @@ -298,11 +298,7 @@ file_find_cell(kafs_data *data, const char *cell, char **realm, int exact) char *p; int ret = -1; -#if 0 -#else if ((F = fopen(_PATH_ARLA_CELLSERVDB, "r"))) { - || (F = fopen(_PATH_OPENAFS_DEBIAN_CELLSERVDB, "r")) - || (F = fopen(_PATH_ARLA_DEBIAN_CELLSERVDB, "r"))) { while (fgets(buf, sizeof(buf), F)) { int cmp; diff --git a/kerberosV/src/lib/krb5/transited.c b/kerberosV/src/lib/krb5/transited.c index e56b39f785b..6d754f16566 100644 --- a/kerberosV/src/lib/krb5/transited.c +++ b/kerberosV/src/lib/krb5/transited.c @@ -181,7 +181,6 @@ expand_realms(krb5_context context, }else if(r->leading_slash && !r->leading_space && prev_realm){ /* yet another exception: if you use x500-names, the leading realm doesn't have to be "quoted" with a space */ - size_t len = strlen(r->realm) + strlen(prev_realm) + 1; char *tmp; size_t len = strlen(r->realm) + strlen(prev_realm) + 1; |