summaryrefslogtreecommitdiffstats
path: root/eBones/usr.sbin/kadmind
diff options
context:
space:
mode:
authorrgrimes <rgrimes@FreeBSD.org>1995-05-30 06:41:30 +0000
committerrgrimes <rgrimes@FreeBSD.org>1995-05-30 06:41:30 +0000
commita14d555c873398b14776ca4f2c33f9c69617afb9 (patch)
tree350f6f98843363254f9afe467ae0c92d5a9d7f43 /eBones/usr.sbin/kadmind
parentf3a2b348daf9fa6063c38d2d69563f732a2f80e7 (diff)
downloadFreeBSD-src-a14d555c873398b14776ca4f2c33f9c69617afb9.zip
FreeBSD-src-a14d555c873398b14776ca4f2c33f9c69617afb9.tar.gz
Remove trailing whitespace.
Diffstat (limited to 'eBones/usr.sbin/kadmind')
-rw-r--r--eBones/usr.sbin/kadmind/admin_server.c18
-rw-r--r--eBones/usr.sbin/kadmind/kadm_funcs.c40
-rw-r--r--eBones/usr.sbin/kadmind/kadm_ser_wrap.c6
-rw-r--r--eBones/usr.sbin/kadmind/kadm_server.c2
-rw-r--r--eBones/usr.sbin/kadmind/kadm_server.h6
5 files changed, 36 insertions, 36 deletions
diff --git a/eBones/usr.sbin/kadmind/admin_server.c b/eBones/usr.sbin/kadmind/admin_server.c
index cca1aaf..7f04ff2 100644
--- a/eBones/usr.sbin/kadmind/admin_server.c
+++ b/eBones/usr.sbin/kadmind/admin_server.c
@@ -96,7 +96,7 @@ char *argv[];
if (krbrlm[0] == 0)
if (krb_get_lrealm(krbrlm, 0) != KSUCCESS) {
- fprintf(stderr,
+ fprintf(stderr,
"Unable to get local realm. Fix krb.conf or use -r.\n");
exit(1);
}
@@ -165,7 +165,7 @@ doexit()
return(0);
#endif /* POSIX */
}
-
+
unsigned pidarraysize = 0;
int *pidarray = (int *)0;
@@ -217,7 +217,7 @@ kadm_listen()
if (errno != EINTR)
log("select: %s",error_message(errno));
continue;
- }
+ }
if (FD_ISSET(admin_fd, &readfds)) {
/* accept the conn */
addrlen = sizeof(peer);
@@ -297,7 +297,7 @@ struct sockaddr_in *who;
/* db locked */
u_long retcode = KADM_DB_INUSE;
char *pdat;
-
+
dat_len = KADM_VERSIZE + sizeof(u_long);
dat = (u_char *) malloc((unsigned)dat_len);
pdat = (char *) dat;
@@ -352,10 +352,10 @@ struct sockaddr_in *who;
}
if ((retval = kadm_ser_in(&dat,&dat_len)) != KADM_SUCCESS)
log("processing request: %s", error_message(retval));
-
+
/* kadm_ser_in did the processing and returned stuff in
dat & dat_len , return the appropriate data */
-
+
out:
dlen = (u_short) dat_len;
@@ -364,13 +364,13 @@ struct sockaddr_in *who;
abort(); /* XXX */
}
dlen = htons(dlen);
-
+
if (krb_net_write(fd, (char *)&dlen, sizeof(u_short)) < 0) {
log("writing dlen to client: %s",error_message(errno));
(void) close(fd);
cleanexit(6);
}
-
+
if (krb_net_write(fd, (char *)dat, dat_len) < 0) {
log(LOG_ERR, "writing to client: %s",error_message(errno));
(void) close(fd);
@@ -435,7 +435,7 @@ kill_children()
{
register int i;
int osigmask;
-
+
osigmask = sigblock(sigmask(SIGCHLD));
for (i = 0; i < pidarraysize; i++) {
diff --git a/eBones/usr.sbin/kadmind/kadm_funcs.c b/eBones/usr.sbin/kadmind/kadm_funcs.c
index 585a834..9f06e30 100644
--- a/eBones/usr.sbin/kadmind/kadm_funcs.c
+++ b/eBones/usr.sbin/kadmind/kadm_funcs.c
@@ -13,7 +13,7 @@ static char rcsid_kadm_funcs_c[] =
"Id: kadm_funcs.c,v 4.3 90/03/20 01:39:51 jon Exp ";
#endif
static const char rcsid[] =
- "$Id$";
+ "$Id: kadm_funcs.c,v 1.1 1995/01/20 03:12:55 wollman Exp $";
#endif lint
/*
@@ -40,7 +40,7 @@ enum acl_types acltype;
extern char *acldir;
(void) sprintf(checkname, "%s.%s@%s", pname, pinst, prealm);
-
+
switch (acltype) {
case ADDACL:
(void) sprintf(filename, "%s%s", acldir, ADD_ACL_FILE);
@@ -85,7 +85,7 @@ Kadm_vals *valsout;
rname, rinstance, rrealm, valsin->name, valsin->instance);
return KADM_UNAUTH;
}
-
+
/* Need to check here for "legal" name and instance */
if (wildcard(valsin->name) || wildcard(valsin->instance)) {
failadd(KADM_ILL_WILDCARD);
@@ -93,7 +93,7 @@ Kadm_vals *valsout;
(void) log("request to add an entry for '%s.%s' from '%s.%s@%s'",
valsin->name, valsin->instance, rname, rinstance, rrealm);
-
+
numfound = kerb_get_principal(KERB_DEFAULT_NAME, KERB_DEFAULT_INST,
&default_princ, 1, &more);
if (numfound == -1) {
@@ -111,7 +111,7 @@ Kadm_vals *valsout;
if (!IS_FIELD(KADM_ATTR,valsin->fields))
data_i.attributes = default_princ.attributes;
if (!IS_FIELD(KADM_MAXLIFE,valsin->fields))
- data_i.max_life = default_princ.max_life;
+ data_i.max_life = default_princ.max_life;
bzero((char *)&default_princ, sizeof(default_princ));
@@ -131,7 +131,7 @@ Kadm_vals *valsout;
bzero((char *)newpw, sizeof(newpw));
data_o = data_i;
- numfound = kerb_get_principal(valsin->name, valsin->instance,
+ numfound = kerb_get_principal(valsin->name, valsin->instance,
&data_o, 1, &more);
if (numfound == -1) {
failadd(KADM_DB_INUSE);
@@ -150,7 +150,7 @@ Kadm_vals *valsout;
} else if (numfound) {
failadd(KADM_UK_SERROR);
} else {
- numfound = kerb_get_principal(valsin->name, valsin->instance,
+ numfound = kerb_get_principal(valsin->name, valsin->instance,
&data_o, 1, &more);
if ((numfound!=1) || (more!=0)) {
failadd(KADM_UK_RERROR);
@@ -183,22 +183,22 @@ Kadm_vals *valsout; /* what data is there */
int more; /* To point to more name.instances */
Principal data_o; /* Data object to hold Principal */
-
+
if (!check_access(rname, rinstance, rrealm, GETACL)) {
(void) log("WARNING: '%s.%s@%s' tried to get '%s.%s's entry",
rname, rinstance, rrealm, valsin->name, valsin->instance);
return KADM_UNAUTH;
}
-
+
if (wildcard(valsin->name) || wildcard(valsin->instance)) {
failget(KADM_ILL_WILDCARD);
}
(void) log("retrieve '%s.%s's entry for '%s.%s@%s'",
valsin->name, valsin->instance, rname, rinstance, rrealm);
-
+
/* Look up the record in the database */
- numfound = kerb_get_principal(valsin->name, valsin->instance,
+ numfound = kerb_get_principal(valsin->name, valsin->instance,
&data_o, 1, &more);
if (numfound == -1) {
failget(KADM_DB_INUSE);
@@ -231,17 +231,17 @@ Kadm_vals *valsout; /* the actual record which is returned */
if (wildcard(valsin1->name) || wildcard(valsin1->instance)) {
failmod(KADM_ILL_WILDCARD);
}
-
+
if (!check_access(rname, rinstance, rrealm, MODACL)) {
(void) log("WARNING: '%s.%s@%s' tried to change '%s.%s's entry",
rname, rinstance, rrealm, valsin1->name, valsin1->instance);
return KADM_UNAUTH;
}
-
+
(void) log("request to modify '%s.%s's entry from '%s.%s@%s' ",
valsin1->name, valsin1->instance, rname, rinstance, rrealm);
-
- numfound = kerb_get_principal(valsin1->name, valsin1->instance,
+
+ numfound = kerb_get_principal(valsin1->name, valsin1->instance,
&data_o, 1, &more);
if (numfound == -1) {
failmod(KADM_DB_INUSE);
@@ -254,7 +254,7 @@ Kadm_vals *valsout; /* the actual record which is returned */
if (IS_FIELD(KADM_ATTR,valsin2->fields))
data_o.attributes = temp_key.attributes;
if (IS_FIELD(KADM_MAXLIFE,valsin2->fields))
- data_o.max_life = temp_key.max_life;
+ data_o.max_life = temp_key.max_life;
if (IS_FIELD(KADM_DESKEY,valsin2->fields)) {
data_o.key_version++;
data_o.kdc_key_ver = server_parm.master_key_version;
@@ -289,7 +289,7 @@ Kadm_vals *valsout; /* the actual record which is returned */
} else if (more) {
failmod(KADM_UK_SERROR);
} else {
- numfound = kerb_get_principal(valsin1->name, valsin1->instance,
+ numfound = kerb_get_principal(valsin1->name, valsin1->instance,
&data_o, 1, &more);
if ((more!=0)||(numfound!=1)) {
failmod(KADM_UK_RERROR);
@@ -335,14 +335,14 @@ des_cblock newpw;
}
(void) log("'%s.%s@%s' wants to change its password",
rname, rinstance, rrealm);
-
+
bcopy(newpw, local_pw, sizeof(local_pw));
-
+
/* encrypt new key in master key */
kdb_encrypt_key (local_pw, local_pw, server_parm.master_key,
server_parm.master_key_schedule, ENCRYPT);
- numfound = kerb_get_principal(rname, rinstance,
+ numfound = kerb_get_principal(rname, rinstance,
&data_o, 1, &more);
if (numfound == -1) {
failchange(KADM_DB_INUSE);
diff --git a/eBones/usr.sbin/kadmind/kadm_ser_wrap.c b/eBones/usr.sbin/kadmind/kadm_ser_wrap.c
index c019bc0..79196c6 100644
--- a/eBones/usr.sbin/kadmind/kadm_ser_wrap.c
+++ b/eBones/usr.sbin/kadmind/kadm_ser_wrap.c
@@ -12,7 +12,7 @@ static char rcsid_module_c[] =
"BonesHeader: /afs/athena.mit.edu/astaff/project/kerberos/src/kadmin/RCS/kadm_ser_wrap.c,v 4.4 89/09/26 09:29:36 jtkohl Exp ";
#endif lint
-/*
+/*
kadm_ser_wrap.c
unwraps wrapped packets and calls the appropriate server subroutine
*/
@@ -28,7 +28,7 @@ unwraps wrapped packets and calls the appropriate server subroutine
Kadm_Server server_parm;
-/*
+/*
kadm_ser_init
set up the server_parm structure
*/
@@ -147,7 +147,7 @@ int *dat_len;
#else
des_key_sched(ad.session, sess_sched);
#endif
- if (retc = (int) krb_rd_priv(in_st, r_len, sess_sched, ad.session,
+ if (retc = (int) krb_rd_priv(in_st, r_len, sess_sched, ad.session,
&server_parm.recv_addr,
&server_parm.admin_addr, &msg_st)) {
clr_cli_secrets();
diff --git a/eBones/usr.sbin/kadmind/kadm_server.c b/eBones/usr.sbin/kadmind/kadm_server.c
index 56631d3..25a58be 100644
--- a/eBones/usr.sbin/kadmind/kadm_server.c
+++ b/eBones/usr.sbin/kadmind/kadm_server.c
@@ -15,7 +15,7 @@ static char rcsid_kadm_server_c[] =
#include <kadm.h>
#include <kadm_err.h>
-/*
+/*
kadm_ser_cpw - the server side of the change_password routine
recieves : KTEXT, {key}
returns : CKSUM, RETCODE
diff --git a/eBones/usr.sbin/kadmind/kadm_server.h b/eBones/usr.sbin/kadmind/kadm_server.h
index db9d21f..33b1904 100644
--- a/eBones/usr.sbin/kadmind/kadm_server.h
+++ b/eBones/usr.sbin/kadmind/kadm_server.h
@@ -1,7 +1,7 @@
/*
- * $Source: /afs/athena.mit.edu/astaff/project/kerberos/src/kadmin/RCS/kadm_server.h,v $
- * $Author: jtkohl $
- * Header: /afs/athena.mit.edu/astaff/project/kerberos/src/kadmin/RCS/kadm_server.h,v 4.1 89/12/21 17:46:51 jtkohl Exp
+ * $Source: /home/ncvs/src/eBones/kadmind/kadm_server.h,v $
+ * $Author: wollman $
+ * Header: /afs/athena.mit.edu/astaff/project/kerberos/src/kadmin/RCS/kadm_server.h,v 4.1 89/12/21 17:46:51 jtkohl Exp
*
* Copyright 1988 by the Massachusetts Institute of Technology.
*
OpenPOWER on IntegriCloud