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

use common setup

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@3308 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1997-08-31 16:55:39 +00:00
parent f196148b04
commit 81f41fc3d6
4 changed files with 10 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
appl/test/gssapi_client.c
View File

@@ -40,12 +40,6 @@
#include <gssapi.h> #include <gssapi.h>
RCSID("$Id$"); RCSID("$Id$");
static void
usage (void)
{
errx (1, "Usage: %s [-p port] [-s service] host", __progname);
}
static int static int
proto (int sock, const char *hostname, const char *service) proto (int sock, const char *hostname, const char *service)
{ {
@@ -198,45 +192,7 @@ doit (const char *hostname, int port, const char *service)
int int
main(int argc, char **argv) main(int argc, char **argv)
{ {
int c; krb5_context context; /* XXX */
int port = 0; int port = client_setup(&context, &argc, argv);
char *service = SERVICE; return doit (argv[argc], port, service);
set_progname (argv[0]);
while ((c = getopt (argc, argv, "p:s:")) != EOF) {
switch (c) {
case 'p': {
struct servent *s = getservbyname (optarg, "tcp");
if (s)
port = s->s_port;
else {
char *ptr;
port = strtol (optarg, &ptr, 10);
if (port == 0 && ptr == optarg)
errx (1, "Bad port `%s'", optarg);
port = htons(port);
}
break;
}
case 's':
service = optarg;
break;
default:
usage ();
break;
}
}
argc -= optind;
argv += optind;
if (argc != 1)
usage ();
if (port == 0)
port = krb5_getportbyname (PORT, "tcp", htons(4711));
return doit (*argv, port, service);
} }

48
appl/test/gssapi_server.c
View File

@@ -40,12 +40,6 @@
#include <gssapi.h> #include <gssapi.h>
RCSID("$Id$"); RCSID("$Id$");
static void
usage (void)
{
errx (1, "Usage: %s [-p port] [-s service]", __progname);
}
static int static int
proto (int sock, const char *service) proto (int sock, const char *service)
{ {
@@ -176,45 +170,7 @@ doit (int port, const char *service)
int int
main(int argc, char **argv) main(int argc, char **argv)
{ {
int c; krb5_context context = NULL; /* XXX */
int port = 0; int port = server_setup(&context, argc, argv);
char *service = SERVICE;
set_progname (argv[0]);
while ((c = getopt (argc, argv, "p:s:")) != EOF) {
switch (c) {
case 'p': {
struct servent *s = getservbyname (optarg, "tcp");
if (s)
port = s->s_port;
else {
char *ptr;
port = strtol (optarg, &ptr, 10);
if (port == 0 && ptr == optarg)
errx (1, "Bad port `%s'", optarg);
port = htons(port);
}
break;
}
case 's':
service = optarg;
break;
default:
usage ();
break;
}
}
argc -= optind;
argv += optind;
if (argc != 0)
usage ();
if (port == 0)
port = krb5_getportbyname (PORT, "tcp", htons(4711));
return doit (port, service); return doit (port, service);
} }

49
appl/test/tcp_client.c
View File

@@ -39,11 +39,7 @@
#include "test_locl.h" #include "test_locl.h"
RCSID("$Id$"); RCSID("$Id$");
static void krb5_context context;
usage (void)
{
errx (1, "Usage: %s [-p port] [-s service] host", __progname);
}
static int static int
proto (int sock, const char *hostname, const char *service) proto (int sock, const char *hostname, const char *service)
@@ -212,45 +208,6 @@ doit (const char *hostname, int port, const char *service)
int int
main(int argc, char **argv) main(int argc, char **argv)
{ {
int c; int port = client_setup(&context, &argc, argv);
int port = 0; return doit (argv[argc], port, service);
char *service = SERVICE;
set_progname (argv[0]);
while ((c = getopt (argc, argv, "p:s:")) != EOF) {
switch (c) {
case 'p': {
struct servent *s = getservbyname (optarg, "tcp");
if (s)
port = s->s_port;
else {
char *ptr;
port = strtol (optarg, &ptr, 10);
if (port == 0 && ptr == optarg)
errx (1, "Bad port `%s'", optarg);
port = htons(port);
}
break;
}
case 's':
service = optarg;
break;
default:
usage ();
break;
}
}
argc -= optind;
argv += optind;
if (argc != 1)
usage ();
if (port == 0)
port = krb5_getportbyname (PORT, "tcp", htons(4711));
return doit (*argv, port, service);
} }

53
appl/test/tcp_server.c
View File

@@ -39,11 +39,7 @@
#include "test_locl.h" #include "test_locl.h"
RCSID("$Id$"); RCSID("$Id$");
static void krb5_context context;
usage (void)
{
errx (1, "Usage: %s [-p port] [-s service]", __progname);
}
static int static int
proto (int sock, const char *service) proto (int sock, const char *service)
@@ -51,7 +47,6 @@ proto (int sock, const char *service)
struct sockaddr_in remote, local; struct sockaddr_in remote, local;
int addrlen; int addrlen;
krb5_address remote_addr, local_addr; krb5_address remote_addr, local_addr;
krb5_context context;
krb5_ccache ccache; krb5_ccache ccache;
krb5_auth_context auth_context; krb5_auth_context auth_context;
krb5_error_code status; krb5_error_code status;
@@ -73,11 +68,6 @@ proto (int sock, const char *service)
|| addrlen != sizeof(remote)) || addrlen != sizeof(remote))
err (1, "getpeername"); err (1, "getpeername");
status = krb5_init_context(&context);
if (status)
errx (1, "krb5_init_context: %s",
krb5_get_err_text(context, status));
status = krb5_auth_con_init (context, &auth_context); status = krb5_auth_con_init (context, &auth_context);
if (status) if (status)
errx (1, "krb5_auth_con_init: %s", errx (1, "krb5_auth_con_init: %s",
@@ -216,45 +206,6 @@ doit (int port, const char *service)
int int
main(int argc, char **argv) main(int argc, char **argv)
{ {
int c; int port = server_setup(&context, argc, argv);
int port = 0;
char *service = SERVICE;
set_progname (argv[0]);
while ((c = getopt (argc, argv, "p:s:")) != EOF) {
switch (c) {
case 'p': {
struct servent *s = getservbyname (optarg, "tcp");
if (s)
port = s->s_port;
else {
char *ptr;
port = strtol (optarg, &ptr, 10);
if (port == 0 && ptr == optarg)
errx (1, "Bad port `%s'", optarg);
port = htons(port);
}
break;
}
case 's':
service = optarg;
break;
default:
usage ();
break;
}
}
argc -= optind;
argv += optind;
if (argc != 0)
usage ();
if (port == 0)
port = krb5_getportbyname (PORT, "tcp", htons(4711));
return doit (port, service); return doit (port, service);
} }