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

break out common function; add gssmaestro (that only tests one context for now)

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17780 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-07-01 08:44:30 +00:00
parent 0af8ebf043
commit 88c076e738
5 changed files with 385 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
appl/gssmask/gssmask.c
View File

@@ -31,22 +31,9 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "common.h"
RCSID("$Id$");
#include <sys/param.h>
#include <krb5.h>
#include <gssapi.h>
#include <unistd.h>
#include <roken.h>
#include <getarg.h>
#include "protocol.h"
/*
*
*/
@@ -61,7 +48,7 @@ struct handle {
};
struct client {
krb5_storage *master;
krb5_storage *sock;
krb5_storage *logging;
char *moniker;
int32_t nHandle;
@@ -74,25 +61,6 @@ FILE *logfile;
static char *targetname;
krb5_context context;
/*
*
*/
static krb5_error_code
store_string(krb5_storage *sp, char *str)
{
size_t len = strlen(str) + 1;
krb5_error_code ret;
ret = krb5_store_int32(sp, len);
if (ret)
return ret;
ret = krb5_storage_write(sp, str, len);
if (ret != len)
return EINVAL;
return 0;
}
/*
*
*/
@@ -299,43 +267,6 @@ acquire_cred(struct client *c,
#define HandleOP(h) \
handle##h(enum gssMaggotOp op, struct client *c)
#define ret32(_client, num) \
do { \
if (krb5_ret_int32((_client)->master, &(num)) != 0) \
errx(1, "krb5_ret_int32 " #num); \
} while(0)
#define retdata(_client, data) \
do { \
if (krb5_ret_data((_client)->master, &(data)) != 0) \
errx(1, "krb5_ret_data " #data); \
} while(0)
#define retstring(_client, data) \
do { \
if (krb5_ret_string((_client)->master, &(data)) != 0) \
errx(1, "krb5_ret_data " #data); \
} while(0)
#define put32(_client, num) \
do { \
if (krb5_store_int32((_client)->master, num) != 0) \
errx(1, "krb5_store_int32 " #num); \
} while(0)
#define putdata(_client, data) \
do { \
if (krb5_store_data((_client)->master, data) != 0) \
errx(1, "krb5_store_data " #data); \
} while(0)
#define putstring(_client, str) \
do { \
if (store_string((_client)->master, str) != 0) \
errx(1, "krb5_store_str " #str); \
} while(0)
/*
*
*/
@@ -824,8 +755,8 @@ handleServer(int fd)
servername, sizeof(servername), NULL, 0, NI_NUMERICHOST);
}
c.master = krb5_storage_from_fd(fd);
if (c.master == NULL)
c.sock = krb5_storage_from_fd(fd);
if (c.sock == NULL)
errx(1, "krb5_storage_from_fd");
close(fd);
@@ -847,7 +778,7 @@ handleServer(int fd)
if ((handler->func)(handler->op, &c))
break;
}
krb5_storage_free(c.master);
krb5_storage_free(c.sock);
if (c.logging)
krb5_storage_free(c.logging);
}