Unix: Merge aklog with aklog_main

Historically, aklog was split into aklog.c (which just contained a
wrapper) and aklog_main.c, which did all of the hard work. Now
that we've purged all of the Windows code from aklog_main.c, we
can merge them both into the same file, so do so.

FIXES 20884

Change-Id: Ifdcb33f4eb2b26703c833056882d95f7f0f654b1
Reviewed-on: http://gerrit.openafs.org/1036
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>

diff --git a/src/aklog/Makefile.in b/src/aklog/Makefile.in
index e3add40..6008c52 100644 (file)
--- a/src/aklog/Makefile.in
+++ b/src/aklog/Makefile.in
@@ -18,8 +18,8 @@ AFSLIBS = ${TOP_LIBDIR}/libprot.a ${TOP_LIBDIR}/libauth.a \
          ${TOP_LIBDIR}/libdes.a ${TOP_LIBDIR}/libcom_err.a \
          ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/libafsutil.a
 
-SRCS=  aklog.c aklog_main.c  krb_util.c linked_list.c
-OBJS=   aklog.o aklog_main.o krb_util.o linked_list.o
+SRCS=  aklog_main.c  krb_util.c linked_list.c
+OBJS=   aklog_main.o krb_util.o linked_list.o
 
 all: aklog asetkey klog
 

diff --git a/src/aklog/aklog.c b/src/aklog/aklog.c
deleted file mode 100644 (file)
index cdca700..0000000
--- a/src/aklog/aklog.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* 
- * $Id$
- *
- * Copyright 1990,1991 by the Massachusetts Institute of Technology
- * For distribution and copying rights, see the file "mit-copyright.h"
- */
-
-#include <afs/stds.h>
-#include "aklog.h"
-
-int
-main(int argc, char *argv[])
-{
-    aklog(argc, argv);
-    exit(0);
-}
-

diff --git a/src/aklog/aklog_main.c b/src/aklog/aklog_main.c
index bc23117..1d8a380 100644 (file)
--- a/src/aklog/aklog_main.c
+++ b/src/aklog/aklog_main.c
@@ -1245,7 +1245,7 @@ static void usage(void)
     exit(AKLOG_USAGE);
 }
 
-void aklog(int argc, char *argv[])
+int main(int argc, char *argv[])
 {
     krb5_context context;
     int status = AKLOG_SUCCESS;