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

should work with krb4

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@4809 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1998-04-26 09:42:56 +00:00
parent cd0ba6b7ac
commit 5f17102fca
1 changed files with 57 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
appl/push/push.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997 Kungliga Tekniska H<>gskolan * Copyright (c) 1997, 1998 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -42,7 +42,12 @@ RCSID("$Id$");
#ifdef KRB4 #ifdef KRB4
static int use_v4 = 0; static int use_v4 = 0;
#endif #endif
#ifdef KRB5
static int use_v5 = 1; static int use_v5 = 1;
static krb5_context context;
#endif
static char *port_str; static char *port_str;
static int do_verbose; static int do_verbose;
static int do_fork; static int do_fork;
@@ -50,13 +55,35 @@ static int do_leave;
static int do_version; static int do_version;
static int do_help; static int do_help;
static ssize_t
net_read (int fd, void *v, size_t len)
{
#if defined(KRB5)
return krb5_net_read (context, &fd, v, len);
#elif defined(KRB4)
return krb_net_read (fd, v, len);
#endif
}
static ssize_t
net_write (int fd, const void *v, size_t len)
{
#if defined(KRB5)
return krb5_net_write (context, &fd, v, len);
#elif defined(KRB4)
return krb_net_write (fd, v, len);
#endif
}
struct getargs args[] = { struct getargs args[] = {
#ifdef KRB4 #ifdef KRB4
{ "krb4", '4', arg_flag, &use_v4, "Use Kerberos V4", { "krb4", '4', arg_flag, &use_v4, "Use Kerberos V4",
NULL }, NULL },
#endif #endif
#ifdef KRB5
{ "krb5", '5', arg_flag, &use_v5, "Use Kerberos V5", { "krb5", '5', arg_flag, &use_v5, "Use Kerberos V5",
NULL }, NULL },
#endif
{ "verbose",'v', arg_flag, &do_verbose, "Verbose", { "verbose",'v', arg_flag, &do_verbose, "Verbose",
NULL }, NULL },
{ "fork", 'f', arg_flag, &do_fork, "Fork deleting proc", { "fork", 'f', arg_flag, &do_fork, "Fork deleting proc",
@@ -124,20 +151,6 @@ typedef enum { INIT = 0, GREAT, USER, PASS, STAT, RETR, DELE, QUIT } pop_state;
#define PUSH_BUFSIZ 65536 #define PUSH_BUFSIZ 65536
/*
* Count on there being a sentinel and ignore `len'.
*/
static inline void *
my_memchr (const void *b, int c, size_t len)
{
unsigned char *p = (unsigned char *)b;
while(*p++ != c)
;
return (void *)(p - 1);
}
#define STEP 16 #define STEP 16
struct write_state { struct write_state {
@@ -200,8 +213,7 @@ write_state_destroy (struct write_state *w)
} }
static int static int
doit(krb5_context context, doit(int s,
int s,
char *host, char *host,
char *user, char *user,
char *outfilename, char *outfilename,
@@ -239,7 +251,7 @@ doit(krb5_context context,
out_len = snprintf (out_buf, sizeof(out_buf), out_len = snprintf (out_buf, sizeof(out_buf),
"USER %s\r\nPASS hej\r\nSTAT\r\n", "USER %s\r\nPASS hej\r\nSTAT\r\n",
user); user);
if (krb5_net_write (context, &s, out_buf, out_len) != out_len) if (net_write (s, out_buf, out_len) != out_len)
err (1, "write"); err (1, "write");
if (verbose > 1) if (verbose > 1)
write (STDERR_FILENO, out_buf, out_len); write (STDERR_FILENO, out_buf, out_len);
@@ -295,13 +307,9 @@ doit(krb5_context context,
close(out_fd); close(out_fd);
if (leavep) { if (leavep) {
state = QUIT; state = QUIT;
krb5_net_write (context, &s, net_write (s, "QUIT\r\n", 6);
"QUIT\r\n", 6); if (verbose > 1)
if (verbose > 1) { net_write (STDERR_FILENO, "QUIT\r\n", 6);
int foo = STDERR_FILENO;
krb5_net_write (context, &foo,
"QUIT\r\n", 6);
}
} else { } else {
if (forkp) { if (forkp) {
pid_t pid; pid_t pid;
@@ -338,12 +346,9 @@ doit(krb5_context context,
} else if (state == DELE) { } else if (state == DELE) {
if (++deleted == count) { if (++deleted == count) {
state = QUIT; state = QUIT;
krb5_net_write (context, &s, "QUIT\r\n", 6); net_write (s, "QUIT\r\n", 6);
if (verbose > 1) { if (verbose > 1)
int foo = STDERR_FILENO; net_write (STDERR_FILENO, "QUIT\r\n", 6);
krb5_net_write (context, &foo,
"QUIT\r\n", 6);
}
break; break;
} }
} else if (++state == STAT) { } else if (++state == STAT) {
@@ -355,12 +360,9 @@ doit(krb5_context context,
count, bytes); count, bytes);
if (count == 0) { if (count == 0) {
state = QUIT; state = QUIT;
krb5_net_write (context, &s, "QUIT\r\n", 6); net_write (s, "QUIT\r\n", 6);
if (verbose > 1) { if (verbose > 1)
int foo = STDERR_FILENO; net_write (STDERR_FILENO, "QUIT\r\n", 6);
krb5_net_write (context, &foo,
"QUIT\r\n", 6);
}
break; break;
} }
} }
@@ -383,7 +385,7 @@ doit(krb5_context context,
else if(state == DELE) else if(state == DELE)
out_len = snprintf (out_buf, sizeof(out_buf), out_len = snprintf (out_buf, sizeof(out_buf),
"DELE %u\r\n", ++asked_deleted); "DELE %u\r\n", ++asked_deleted);
if (krb5_net_write (context, &s, out_buf, out_len) != out_len) if (net_write (s, out_buf, out_len) != out_len)
err (1, "write"); err (1, "write");
if (verbose > 1) if (verbose > 1)
write (STDERR_FILENO, out_buf, out_len); write (STDERR_FILENO, out_buf, out_len);
@@ -395,9 +397,9 @@ doit(krb5_context context,
return 0; return 0;
} }
#ifdef KRB5
static int static int
do_v5 (krb5_context context, do_v5 (char *host,
char *host,
int port, int port,
char *user, char *user,
char *filename, char *filename,
@@ -451,13 +453,13 @@ do_v5 (krb5_context context,
krb5_get_err_text (context, ret)); krb5_get_err_text (context, ret));
return 1; return 1;
} }
return doit (context, s, host, user, filename, leavep, verbose, forkp); return doit (s, host, user, filename, leavep, verbose, forkp);
} }
#endif
#ifdef KRB4 #ifdef KRB4
static int static int
do_v4 (krb5_context context, do_v4 (char *host,
char *host,
int port, int port,
char *user, char *user,
char *filename, char *filename,
@@ -492,7 +494,7 @@ do_v4 (krb5_context context,
warnx("krb_sendauth: %s", krb_get_err_text(ret)); warnx("krb_sendauth: %s", krb_get_err_text(ret));
return 1; return 1;
} }
return doit (context, s, host, user, filename, leavep, verbose, forkp); return doit (s, host, user, filename, leavep, verbose, forkp);
} }
#endif /* KRB4 */ #endif /* KRB4 */
@@ -532,12 +534,13 @@ main(int argc, char **argv)
int optind = 0; int optind = 0;
int ret = 1; int ret = 1;
char *host, *user, *filename; char *host, *user, *filename;
#ifdef KRB5
krb5_context context; krb5_context context;
krb5_init_context (&context);
#endif
set_progname (argv[0]); set_progname (argv[0]);
krb5_init_context (&context);
if (getarg (args, sizeof(args) / sizeof(args[0]), argc, argv, if (getarg (args, sizeof(args) / sizeof(args[0]), argc, argv,
&optind)) &optind))
usage (1); usage (1);
@@ -571,19 +574,25 @@ main(int argc, char **argv)
} }
} }
if (port == 0) if (port == 0)
#ifdef KRB5
port = krb5_getportbyname (context, "kpop", "tcp", 1109); port = krb5_getportbyname (context, "kpop", "tcp", 1109);
#elif defined(KRB5)
port = k_getportbyname ("kpop", "tcp", 1109);
#endif
parse_pobox (argv[0], argv[1], parse_pobox (argv[0], argv[1],
&host, &user, &filename); &host, &user, &filename);
#ifdef KRB5
if (ret && use_v5) { if (ret && use_v5) {
ret = do_v5 (context, host, port, user, filename, ret = do_v5 (host, port, user, filename,
do_leave, do_verbose, do_fork); do_leave, do_verbose, do_fork);
} }
#endif
#ifdef KRB4 #ifdef KRB4
if (ret && use_v4) { if (ret && use_v4) {
ret = do_v4 (context, host, port, user, filename, ret = do_v4 (host, port, user, filename,
do_leave, do_verbose, do_fork); do_leave, do_verbose, do_fork);
} }
#endif /* KRB4 */ #endif /* KRB4 */