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

use new flags, return moniker

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@18124 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-09-20 03:31:50 +00:00
parent ec4137ea11
commit e8d7e48ab5
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
appl/gssmask/gssmask.c
View File

@@ -569,7 +569,7 @@ HandleOP(Verify)
static int static int
HandleOP(GetVersionAndCapabilities) HandleOP(GetVersionAndCapabilities)
{ {
int32_t cap = 0x10; /* has moniker */ int32_t cap = ISSERVER | HAS_MONIKER;
char name[256] = "unknown", *str; char name[256] = "unknown", *str;
if (targetname) if (targetname)
@@ -751,15 +751,19 @@ find_op(int32_t op)
} }
static struct client * static struct client *
create_client(int fd) create_client(int fd, int port, const char *moniker)
{ {
struct client *c; struct client *c;
char hostname[MAXHOSTNAMELEN];
c = ecalloc(1, sizeof(*c)); c = ecalloc(1, sizeof(*c));
gethostname(hostname, sizeof(hostname)); if (moniker) {
asprintf(&c->moniker, "gssmask: %s", hostname); c->moniker = estrdup(moniker);
} else {
char hostname[MAXHOSTNAMELEN];
gethostname(hostname, sizeof(hostname));
asprintf(&c->moniker, "gssmask: %s:%d", hostname, port);
}
{ {
c->salen = sizeof(c->sa); c->salen = sizeof(c->sa);
@@ -819,6 +823,7 @@ static char *port_str;
static int version_flag; static int version_flag;
static int help_flag; static int help_flag;
static char *logfile_str; static char *logfile_str;
static char *moniker_str;
static int port = 4711; static int port = 4711;
@@ -829,6 +834,8 @@ struct getargs args[] = {
"number-of-service" }, "number-of-service" },
{ "logfile", 0, arg_string, &logfile_str, "logfile", { "logfile", 0, arg_string, &logfile_str, "logfile",
"number-of-service" }, "number-of-service" },
{ "moniker", 0, arg_string, &moniker_str, "nickname",
"name" },
{ "version", 0, arg_flag, &version_flag, "Print version", { "version", 0, arg_flag, &version_flag, "Print version",
NULL }, NULL },
{ "help", 0, arg_flag, &help_flag, NULL, { "help", 0, arg_flag, &help_flag, NULL,
@@ -892,7 +899,7 @@ main(int argc, char **argv)
{ {
struct client *c; struct client *c;
c = create_client(0); c = create_client(0, port, moniker_str);
/* close(0); */ /* close(0); */
handleServer(c); handleServer(c);