add Berkeley headers

SCCS-vsn: old/athena/kpasswd/kpasswd.c 1.2
SCCS-vsn: old/athena/kpasswd/Makefile 1.2
SCCS-vsn: old/athena/kpasswd/kpasswd_proto.h 1.2
SCCS-vsn: libexec/kpasswdd/kpasswdd.c 1.2
SCCS-vsn: old/athena/kpasswd/kpasswdd.c 1.2

diff --git a/usr/src/libexec/kpasswdd/kpasswdd.c b/usr/src/libexec/kpasswdd/kpasswdd.c
index 818060c..7af7e20 100644 (file)
--- a/usr/src/libexec/kpasswdd/kpasswdd.c
+++ b/usr/src/libexec/kpasswdd/kpasswdd.c
@@ -1,3 +1,23 @@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)kpasswdd.c 1.2 (Berkeley) %G%";
+#endif /* not lint */

 
 /*
  * kpasswdd - update a principal's passwd field in the Kerberos
 
 /*
  * kpasswdd - update a principal's passwd field in the Kerberos

diff --git a/usr/src/old/athena/kpasswd/Makefile b/usr/src/old/athena/kpasswd/Makefile
index d831bfa..88675c4 100644 (file)
--- a/usr/src/old/athena/kpasswd/Makefile
+++ b/usr/src/old/athena/kpasswd/Makefile
@@ -17,25 +17,22 @@
 # @(#)Makefile 5.3 (Berkeley) 9/20/88
 #
 
 # @(#)Makefile 5.3 (Berkeley) 9/20/88
 #
 

-CDEFS= -DKERBEROS
-CFLAGS=        -O
+CFLAGS=        -O -DKERBEROS

 LIBC=  /lib/libc.a
 LIBC=  /lib/libc.a

-KLIB=  /usr/local/lib/libkrb.a
-DESLIB=        /usr/local/lib/libdes.a
-KDBLIB=        /usr/local/lib/libkrb_dbm.a
-INCDIR=        /usr/include/kerberos

 SRC1=  kpasswd.c
 SRC1=  kpasswd.c

+OBJ1=  kpasswd.o

 SRC2=  kpasswdd.c
 SRC2=  kpasswdd.c

+OBJ2=  kpasswdd.o

 OBJS=  kpasswd.o kpasswdd.o
 MAN=   kpasswd.0 kpasswdd.0
 
 all: kpasswd kpasswdd
 
 OBJS=  kpasswd.o kpasswdd.o
 MAN=   kpasswd.0 kpasswdd.0
 
 all: kpasswd kpasswdd
 

-kpasswd: ${SRC1} ${LIBC} ${KLIB} ${DESLIB} kpasswd.c
-       ${CC} -o $@ -I${INCDIR} ${CFLAGS} ${CDEFS} ${SRC1} ../lib/des_rw.o -lutil -lkrb -ldes
+kpasswd: ${OBJ1} ${LIBC}
+       ${CC} -o $@ ${CFLAGS} ${OBJ1} -lutil -lkrb -ldes

 
 

-kpasswdd: ${SRC2} ${LIBC} ${KLIB} ${DESLIB} kpasswdd.c
-       ${CC} -o $@ -I${INCDIR} ${CFLAGS} ${CDEFS} ${SRC2} ../lib/des_rw.o -lutil -lkrb -lkrb_dbm -ldes
+kpasswdd: ${OBJ2} ${LIBC}
+       ${CC} -o $@ ${CFLAGS} ${OBJ2} -lutil -lkrb -lkdb -ldes

 
 clean:
        rm -f ${OBJS} core kpasswd kpasswdd
 
 clean:
        rm -f ${OBJS} core kpasswd kpasswdd


@@ -47,8 +44,8 @@ depend: ${SRC1} ${SRC2}
        mkdep -p ${CFLAGS} ${SRC1} ${SRC2}
 
 install: ${MAN}
        mkdep -p ${CFLAGS} ${SRC1} ${SRC2}
 
 install: ${MAN}

-       install -s -o bin -g bin -m 755 kpasswdd ${DESTDIR}/etc/kpasswdd
-       install -s -o bin -g bin -m 755 kpasswd ${DESTDIR}/usr/local
+       install -s -o bin -g bin -m 755 kpasswdd ${DESTDIR}/usr/libexec/kpasswdd
+       install -s -o bin -g bin -m 755 kpasswd ${DESTDIR}/usr/athena

        install -c -o bin -g bin -m 444 kpasswd.0 ${DESTDIR}/usr/man/cat1
        install -c -o bin -g bin -m 444 kpasswdd.0 ${DESTDIR}/usr/man/cat8
 
        install -c -o bin -g bin -m 444 kpasswd.0 ${DESTDIR}/usr/man/cat1
        install -c -o bin -g bin -m 444 kpasswdd.0 ${DESTDIR}/usr/man/cat8
 

diff --git a/usr/src/old/athena/kpasswd/kpasswd.c b/usr/src/old/athena/kpasswd/kpasswd.c
index 4c51a9c..ed69496 100644 (file)
--- a/usr/src/old/athena/kpasswd/kpasswd.c
+++ b/usr/src/old/athena/kpasswd/kpasswd.c
@@ -1,5 +1,27 @@
+
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)kpasswd.c  1.2 (Berkeley) %G%";
+#endif /* not lint */
+

 /*
 /*

- * kpasswd - client program to updated Kerberos password
+ * kpasswd - client program to update Kerberos password

  *
  * K. Fall
  * 12-Dec-88
  *
  * K. Fall
  * 12-Dec-88


@@ -59,13 +81,13 @@ char        **argv;
                        SERVICE, PROTO);
                exit(1);
        }
                        SERVICE, PROTO);
                exit(1);
        }

-       if((rval = get_krbrlm(realm,1)) != KSUCCESS) {
+       if((rval = krb_get_lrealm(realm,1)) != KSUCCESS) {

                fprintf(stderr, "couldn't get local Kerberos realm: %s\n",
                        krb_err_txt[rval]);
                exit(1);
        }
 
                fprintf(stderr, "couldn't get local Kerberos realm: %s\n",
                        krb_err_txt[rval]);
                exit(1);
        }
 

-       if((rval = get_krbhst(krbhst, realm, 1)) != KSUCCESS) {
+       if((rval = krb_get_krbhst(krbhst, realm, 1)) != KSUCCESS) {

                fprintf(stderr, "couldn't get Kerberos host: %s\n",
                        krb_err_txt[rval]);
                exit(1);
                fprintf(stderr, "couldn't get Kerberos host: %s\n",
                        krb_err_txt[rval]);
                exit(1);

diff --git a/usr/src/old/athena/kpasswd/kpasswd_proto.h b/usr/src/old/athena/kpasswd/kpasswd_proto.h
index e5f652d..719b237 100644 (file)
--- a/usr/src/old/athena/kpasswd/kpasswd_proto.h
+++ b/usr/src/old/athena/kpasswd/kpasswd_proto.h
@@ -1,3 +1,21 @@
+
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+

 /*
  * kpasswd_proto
  *
 /*
  * kpasswd_proto
  *

diff --git a/usr/src/old/athena/kpasswd/kpasswdd.c b/usr/src/old/athena/kpasswd/kpasswdd.c
index 818060c..7af7e20 100644 (file)
--- a/usr/src/old/athena/kpasswd/kpasswdd.c
+++ b/usr/src/old/athena/kpasswd/kpasswdd.c
@@ -1,3 +1,23 @@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)kpasswdd.c 1.2 (Berkeley) %G%";
+#endif /* not lint */

 
 /*
  * kpasswdd - update a principal's passwd field in the Kerberos
 
 /*
  * kpasswdd - update a principal's passwd field in the Kerberos