oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

exit on sigint. don't leak memory.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@2564 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1997-07-23 23:52:17 +00:00
parent 13e484addf
commit 9f0c281b7e
1 changed files with 38 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
kpasswd/kpasswdd.c
View File

@@ -40,6 +40,8 @@
#include <hdb.h> #include <hdb.h>
RCSID("$Id$"); RCSID("$Id$");
static sig_atomic_t exit_flag = 0;
static void static void
syslog_and_die (const char *m, ...) syslog_and_die (const char *m, ...)
{ {
@@ -236,7 +238,7 @@ change (krb5_context context,
return; return;
} }
ent.principal = principal; krb5_copy_principal (context, principal, &ent.principal);
ret = db->fetch (context, db, &ent); ret = db->fetch (context, db, &ent);
@@ -271,6 +273,7 @@ change (krb5_context context,
} else { } else {
Event *e; Event *e;
free_EncryptionKey (old_keyblock);
memset (old_keyblock, 0, sizeof(*old_keyblock)); memset (old_keyblock, 0, sizeof(*old_keyblock));
old_keyblock->keytype = new_keyblock.keytype; old_keyblock->keytype = new_keyblock.keytype;
krb5_data_copy (&old_keyblock->keyvalue, krb5_data_copy (&old_keyblock->keyvalue,
@@ -280,10 +283,11 @@ change (krb5_context context,
e = malloc(sizeof(*e)); e = malloc(sizeof(*e));
e->time = time(NULL); e->time = time(NULL);
krb5_copy_principal (context, principal, &e->principal); krb5_copy_principal (context, principal, &e->principal);
free_Event (ent.modified_by);
free (ent.modified_by);
ent.modified_by = e; ent.modified_by = e;
ret = db->store (context, db, &ent); ret = db->store (context, db, &ent);
} }
memset (&new_keyblock, 0, sizeof(new_keyblock));
krb5_free_keyblock (context, &new_keyblock); krb5_free_keyblock (context, &new_keyblock);
if (ret == -1) { if (ret == -1) {
@@ -349,7 +353,6 @@ verify (krb5_context context,
syslog (LOG_ERR, "initial flag not set"); syslog (LOG_ERR, "initial flag not set");
reply_error (context, server, s, addr, ret, 1, reply_error (context, server, s, addr, ret, 1,
"initial flag not set"); "initial flag not set");
krb5_free_ticket (context, *ticket);
goto out; goto out;
} }
krb_priv_data.data = msg + 6 + ap_req_len; krb_priv_data.data = msg + 6 + ap_req_len;
@@ -389,19 +392,22 @@ process (krb5_context context,
krb5_data_zero (&out_data); krb5_data_zero (&out_data);
if (verify (context, &auth_context, server, &ticket, &out_data, if (verify (context, &auth_context, server, &ticket, &out_data,
s, addr, msg, len) == 0) s, addr, msg, len) == 0) {
change (context, change (context,
auth_context, auth_context,
ticket->client, ticket->client,
s, s,
addr, addr,
&out_data); &out_data);
krb5_free_ticket (context, ticket);
free (ticket);
}
krb5_data_free (&out_data); krb5_data_free (&out_data);
krb5_auth_con_free (context, auth_context); krb5_auth_con_free (context, auth_context);
} }
static void static int
doit (int port) doit (int port)
{ {
krb5_error_code ret; krb5_error_code ret;
@@ -445,22 +451,44 @@ doit (int port)
addr.sin_port = port; addr.sin_port = port;
if (bind (s, (struct sockaddr *)&addr, sizeof(addr)) < 0) if (bind (s, (struct sockaddr *)&addr, sizeof(addr)) < 0)
syslog_and_die ("bind: %m"); syslog_and_die ("bind: %m");
for (;;) { while(exit_flag == 0) {
struct sockaddr_in other_addr; struct sockaddr_in other_addr;
struct fd_set fdset;
u_char buf[BUFSIZ]; u_char buf[BUFSIZ];
int ret; int ret;
int addrlen = sizeof(other_addr); int addrlen = sizeof(other_addr);
FD_ZERO(&fdset);
FD_SET(s, &fdset);
ret = select (s + 1, &fdset, NULL, NULL, NULL);
if (ret < 0)
if (errno == EINTR)
continue;
else
syslog_and_die ("select: %m");
if (!FD_ISSET(s, &fdset))
continue;
ret = recvfrom (s, buf, sizeof(buf), 0, ret = recvfrom (s, buf, sizeof(buf), 0,
(struct sockaddr *)&other_addr, (struct sockaddr *)&other_addr,
&addrlen); &addrlen);
if (ret < 0) if (ret < 0)
if(errno == EINTR) if(errno == EINTR)
continue; break;
else else
syslog_and_die ("recvfrom: %m"); syslog_and_die ("recvfrom: %m");
process (context, server, s, &other_addr, buf, ret); process (context, server, s, &other_addr, buf, ret);
} }
krb5_free_principal (context, server);
krb5_free_context (context);
return 0;
}
static RETSIGTYPE
sigterm(int sig)
{
exit_flag = 1;
} }
int int
@@ -469,6 +497,7 @@ main (int argc, char **argv)
set_progname (argv[0]); set_progname (argv[0]);
openlog ("kpasswdd", LOG_ODELAY | LOG_PID, LOG_AUTH); openlog ("kpasswdd", LOG_ODELAY | LOG_PID, LOG_AUTH);
doit (krb5_getportbyname ("kpasswd", "udp", htons(KPASSWD_PORT))); signal (SIGINT, sigterm);
return 0;
return doit (krb5_getportbyname ("kpasswd", "udp", htons(KPASSWD_PORT)));
} }