diff options
| author | Paul Park <pjpark@mit.edu> | 1995-05-12 20:05:42 +0000 |
|---|---|---|
| committer | Paul Park <pjpark@mit.edu> | 1995-05-12 20:05:42 +0000 |
| commit | ba90a92696df7d0c1b4d106421fab15d864e742a (patch) | |
| tree | be102849529d9f31bdfc4e373fc5b2bd3ef96eda | |
| parent | 6a199a4ad4169de88d6c797f23a5f8552280dc05 (diff) | |
| download | krb5-ba90a92696df7d0c1b4d106421fab15d864e742a.tar.gz krb5-ba90a92696df7d0c1b4d106421fab15d864e742a.tar.xz krb5-ba90a92696df7d0c1b4d106421fab15d864e742a.zip | |
Fix errors for Ultrix
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5804 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/kadmin/v5client/ChangeLog | 7 | ||||
| -rw-r--r-- | src/kadmin/v5client/configure.in | 2 | ||||
| -rw-r--r-- | src/kadmin/v5client/kadmin5.c | 5 |
3 files changed, 11 insertions, 3 deletions
diff --git a/src/kadmin/v5client/ChangeLog b/src/kadmin/v5client/ChangeLog index cd80c44b20..4285e5970d 100644 --- a/src/kadmin/v5client/ChangeLog +++ b/src/kadmin/v5client/ChangeLog @@ -1,4 +1,11 @@ +Fri May 12 16:04:01 EDT 1995 Paul Park (pjpark@mit.edu) + * configure.in - Check for regex.h. + * kadmin5.c - Use regex.h only if present. Correctly calculate + length of argument string to build when command is + on command line. + + Thu May 11 12:18:27 EDT 1995 Paul Park (pjpark@mit.edu) * kadmin5.c - Change "programname" to be the last component of argv[0]. Also correctly terminate generated diff --git a/src/kadmin/v5client/configure.in b/src/kadmin/v5client/configure.in index d870e25101..24acb693df 100644 --- a/src/kadmin/v5client/configure.in +++ b/src/kadmin/v5client/configure.in @@ -4,7 +4,7 @@ CONFIG_RULES AC_SET_BUILDTOP AC_PROG_INSTALL AC_PROG_YACC -AC_HAVE_HEADERS(pwd.h) +AC_HAVE_HEADERS(pwd.h regex.h) AC_HAVE_FUNCS(strptime re_comp regcomp getcwd) AC_CONST WITH_NETLIB diff --git a/src/kadmin/v5client/kadmin5.c b/src/kadmin/v5client/kadmin5.c index 9a51bbf998..92ed342f55 100644 --- a/src/kadmin/v5client/kadmin5.c +++ b/src/kadmin/v5client/kadmin5.c @@ -33,9 +33,9 @@ #if HAVE_PWD_H #include <pwd.h> #endif /* HAVE_PWD_H */ -#if HAVE_RE_COMP || HAVE_REGCOMP +#if HAVE_REGEX_H #include <regex.h> -#endif /* HAVE_RE_COMP || HAVE_REGCOMP */ +#endif /* HAVE_REGEX_H */ /* * Global storage. @@ -1413,6 +1413,7 @@ kadmin_startup(argc, argv) for (i=optind; i<argc; i++) n2alloc += strlen(argv[i]) + 1; + n2alloc++; if (action = (char *) malloc(n2alloc)) { for (i=optind; i<argc; i++) { strcat(action, argv[i]); |