#ifdef OLD_COMPAT
#define OLD_ZEPHYR_VERSION "ZEPH0.0"
#define OLD_CLIENT_INCOMPSUBS "INCOMP"
-static void old_compat_subscr_sendlist(ZNotice_t *notice, int auth,
- struct sockaddr_in *who);
+static void old_compat_subscr_sendlist __P((ZNotice_t *notice, int auth,
+ struct sockaddr_in *who));
extern int old_compat_count_subscr; /* counter of old use */
#endif /* OLD_COMPAT */
#ifdef NEW_COMPAT
#define NEW_OLD_ZEPHYR_VERSION "ZEPH0.1"
-static void new_old_compat_subscr_sendlist(ZNotice_t *notice, int auth,
- struct sockaddr_in *who);
+static void new_old_compat_subscr_sendlist __P((ZNotice_t *notice, int auth,
+ struct sockaddr_in *who));
extern int new_compat_count_subscr; /* counter of old use */
#endif /* NEW_COMPAT */
-static Code_t add_subscriptions(Client *who, Destlist *subs_queue,
- ZNotice_t *notice, Server *server);
-static Destlist *extract_subscriptions(ZNotice_t *notice);
-static void free_subscriptions(Destlist *subs);
-static void free_subscription(Destlist *sub);
-static char **subscr_marshal_subs(ZNotice_t *notice, int auth,
- struct sockaddr_in *who,
- int *found);
-static Destlist *subscr_copy_def_subs(char *person);
-static Code_t subscr_realm_sendit(Client *who, Destlist *subs,
- ZNotice_t *notice, ZRealm *realm);
-static void subscr_unsub_sendit(Client *who, Destlist *subs,
- ZRealm *realm);
+extern char *re_comp(), *re_conv();
+static Code_t add_subscriptions __P((Client *who, Destlist *subs_queue,
+ ZNotice_t *notice, Server *server));
+static Destlist *extract_subscriptions __P((ZNotice_t *notice));
+static void free_subscriptions __P((Destlist *subs));
+static void free_subscription __P((Destlist *sub));
+static char **subscr_marshal_subs __P((ZNotice_t *notice, int auth,
+ struct sockaddr_in *who,
+ int *found));
+static Destlist *subscr_copy_def_subs __P((char *person));
+static Code_t subscr_realm_sendit __P((Client *who, Destlist *subs,
+ ZNotice_t *notice, Realm *realm));
+static void subscr_unsub_realms __P((Destlist *newsubs));
+static void subscr_unsub_sendit __P((Client *who, Destlist *subs,
+ Realm *realm));
+static int cl_match __P((Destlist*, Client *));
static int defaults_read = 0; /* set to 1 if the default subs
are in memory */
*/
Code_t
-subscr_subscribe(Client *who,
- ZNotice_t *notice,
- Server *server)
+subscr_subscribe(who, notice, server)
+ Client *who;
+ ZNotice_t *notice;
+ Server *server;
{
Destlist *subs;
}
static Code_t
-add_subscriptions(Client *who,
- Destlist *subs,
- ZNotice_t *notice,
- Server *server)
+add_subscriptions(who, subs, notice, server)
+ Client *who;
+ Destlist *subs;
+ ZNotice_t *notice;
+ Server *server;
{
Destlist *next;
Code_t retval;
Acl *acl;
String *sender;
- ZRealm *realm = NULL;
+ Realm *realm = NULL;
if (!subs)
return ZERR_NONE; /* no subscr -> no error */
}
}
if (realm && !bdumping) {
+ if (server && server == me_server) {
retval = subscr_realm_sendit(who, subs, notice, realm);
if (retval != ZERR_NONE) {
+ free_subscriptions(subs);
+ free_string(sender);
+ return(retval);
+ } else {
+ /* free this one, will get from ADD */
free_subscription(subs);
- continue; /* the for loop */
+ }
} else {
/* Indicates we leaked traffic back to our realm */
- free_subscription(subs); /* free this one, wil get from
- ADD */
}
} else {
retval = triplet_register(who, &subs->dest, NULL);
}
} else {
/* If realm, let the REALM_ADD_SUBSCRIBE do insertion */
- Destlist_insert(&who->subs, subs);
+ LIST_INSERT(&who->subs, subs);
}
}
}
*/
Code_t
-subscr_def_subs(Client *who)
+subscr_def_subs(who)
+ Client *who;
{
Destlist *subs;
}
void
-subscr_reset(void)
+subscr_reset()
{
#if 0
zdbug((LOG_DEBUG, "subscr_reset()"));
}
static Destlist *
-subscr_copy_def_subs(char *person)
+subscr_copy_def_subs(person)
+ char *person;
{
int retval, fd;
struct stat statbuf;
*/
Code_t
-subscr_cancel(struct sockaddr_in *sin,
- ZNotice_t *notice)
+subscr_cancel(sin, notice)
+ struct sockaddr_in *sin;
+ ZNotice_t *notice;
{
- ZRealm *realm;
+ Realm *realm;
Client *who;
Destlist *cancel_subs, *subs, *cancel_next, *client_subs, *client_next;
Code_t retval;
int found = 0;
+ int relation;
#if 0
zdbug((LOG_DEBUG,"subscr_cancel"));
for (client_subs = who->subs; client_subs; client_subs = client_next) {
client_next = client_subs->next;
if (ZDest_eq(&client_subs->dest, &subs->dest)) {
- Destlist_delete(client_subs);
+ LIST_DELETE(client_subs);
retval = triplet_deregister(who, &client_subs->dest, NULL);
if (retval == ZSRV_EMPTYCLASS &&
client_subs->dest.recip->string[0] == '@') {
}
Code_t
-subscr_realm_cancel(struct sockaddr_in *sin,
- ZNotice_t *notice,
- ZRealm *realm)
+subscr_realm_cancel(sin, notice, realm)
+ struct sockaddr_in *sin;
+ ZNotice_t *notice;
+ Realm *realm;
{
+ Client *who;
Destlist *cancel_subs, *subs, *client_subs, *next, *next2;
Code_t retval;
int found = 0;
for (client_subs = realm->subs; client_subs; client_subs = next2) {
next2 = client_subs->next;
if (ZDest_eq(&client_subs->dest, &subs->dest)) {
- Destlist_delete(client_subs);
+ LIST_DELETE(client_subs);
retval = triplet_deregister(realm->client, &client_subs->dest, realm);
free_subscription(client_subs);
found = 1;
*/
void
-subscr_cancel_client(Client *client)
+subscr_cancel_client(client)
+ Client *client;
{
Destlist *subs, *next;
Code_t retval;
- ZRealm *realm;
+ Realm *realm;
#if 0
zdbug((LOG_DEBUG,"subscr_cancel_client %s",
*/
void
-subscr_sendlist(ZNotice_t *notice,
- int auth,
- struct sockaddr_in *who)
+subscr_sendlist(notice, auth, who)
+ ZNotice_t *notice;
+ int auth;
+ struct sockaddr_in *who;
{
char **answer;
int found;
}
static char **
-subscr_marshal_subs(ZNotice_t *notice,
- int auth,
- struct sockaddr_in *who,
- int *found)
+subscr_marshal_subs(notice, auth, who, found)
+ ZNotice_t *notice;
+ int auth;
+ struct sockaddr_in *who;
+ int *found;
{
char **answer = NULL;
unsigned short temp;
zdbug((LOG_DEBUG, "subscr_marshal"));
#endif
*found = 0;
-
+
/* Note that the following code is an incredible crock! */
/* We cannot send multiple packets as acknowledgements to the client,
/*ARGSUSED*/
Code_t
-subscr_send_subs(Client *client)
+subscr_send_subs(client)
+ Client *client;
{
int i = 0;
Destlist *subs;
-#ifdef HAVE_KRB5
- char buf[512];
- unsigned char *bufp;
-#else
#ifdef HAVE_KRB4
char buf[512];
C_Block cblock;
#endif /* HAVE_KRB4 */
-#endif
char buf2[512];
char *list[7 * NUM_FIELDS];
int num = 0;
list[num++] = buf2;
-#ifdef HAVE_KRB5
-#ifdef HAVE_KRB4 /* XXX make this optional for server transition time */
- if (Z_enctype(client->session_keyblock) == ENCTYPE_DES_CBC_CRC) {
- bufp = malloc(Z_keylen(client->session_keyblock));
- if (bufp == NULL) {
- syslog(LOG_WARNING, "subscr_send_subs: cannot allocate memory for DES keyblock: %m");
- return errno;
- }
- des_ecb_encrypt((C_Block *)Z_keydata(client->session_keyblock), (C_Block *)bufp, serv_ksched.s, DES_ENCRYPT);
- retval = ZMakeAscii(buf, sizeof(buf), bufp, Z_keylen(client->session_keyblock));
- } else {
-#endif
- bufp = malloc(Z_keylen(client->session_keyblock) + 8); /* + enctype
- + length */
- if (bufp == NULL) {
- syslog(LOG_WARNING, "subscr_send_subs: cannot allocate memory for keyblock: %m");
- return errno;
- }
- *(krb5_enctype *)&bufp[0] = htonl(Z_enctype(client->session_keyblock));
- *(u_int32_t *)&bufp[4] = htonl(Z_keylen(client->session_keyblock));
- memcpy(&bufp[8], Z_keydata(client->session_keyblock), Z_keylen(client->session_keyblock));
-
- retval = ZMakeZcode(buf, sizeof(buf), bufp, Z_keylen(client->session_keyblock) + 8);
-#ifdef HAVE_KRB4
- }
-#endif /* HAVE_KRB4 */
-#else /* HAVE_KRB5 */
#ifdef HAVE_KRB4
#ifdef NOENCRYPTION
memcpy(cblock, client->session_key, sizeof(C_Block));
-#else /* NOENCRYPTION */
+#else
des_ecb_encrypt(client->session_key, cblock, serv_ksched.s, DES_ENCRYPT);
-#endif /* NOENCRYPTION */
+#endif
retval = ZMakeAscii(buf, sizeof(buf), cblock, sizeof(C_Block));
-#endif /* HAVE_KRB4 */
-#endif /* HAVE_KRB5 */
-
-#if defined(HAVE_KRB4) || defined(HAVE_KRB5)
if (retval != ZERR_NONE) {
#if 0
zdbug((LOG_DEBUG,"zmakeascii failed: %s", error_message(retval)));
zdbug((LOG_DEBUG, "cblock %s", buf));
#endif
}
-#endif /* HAVE_KRB4 || HAVE_KRB5*/
+#endif /* HAVE_KRB4 */
retval = bdump_send_list_tcp(SERVACK, &client->addr, ZEPHYR_ADMIN_CLASS,
num > 1 ? "CBLOCK" : "", ADMIN_NEWCLT,
client->principal->string, "", list, num);
}
static void
-free_subscriptions(Destlist *subs)
+free_subscriptions(subs)
+ Destlist *subs;
{
Destlist *next;
*/
static Destlist *
-extract_subscriptions(ZNotice_t *notice)
+extract_subscriptions(notice)
+ ZNotice_t *notice;
{
Destlist *subs = NULL, *sub;
char *recip, *class_name, *classinst;
sub->dest.recip = make_string("", 0);
else
sub->dest.recip = make_string(recip, 0);
- Destlist_insert(&subs, sub);
+ LIST_INSERT(&subs, sub);
}
return subs;
}
*/
void
-subscr_dump_subs(FILE *fp,
- Destlist *subs)
+subscr_dump_subs(fp, subs)
+ FILE *fp;
+ Destlist *subs;
{
+ char *p;
+
if (!subs) /* no subscriptions to dump */
return;
/* As it exists, this function expects to take only the first sub from the
* Destlist. At some point, it and the calling code should be replaced */
static Code_t
-subscr_realm_sendit(Client *who,
- Destlist *subs,
- ZNotice_t *notice,
- ZRealm *realm)
+subscr_realm_sendit(who, subs, notice, realm)
+ Client *who;
+ Destlist *subs;
+ ZNotice_t *notice;
+ Realm *realm;
{
ZNotice_t snotice;
char *pack;
int packlen;
+ int found = 0, i;
char **text;
Code_t retval;
char addr[16]; /* xxx.xxx.xxx.xxx max */
/* Called from subscr_realm and subscr_foreign_user */
static Code_t
-subscr_add_raw(Client *client,
- ZRealm *realm,
- Destlist *newsubs)
+subscr_add_raw(client, realm, newsubs)
+ Client *client;
+ Realm *realm;
+ Destlist *newsubs;
{
- Destlist *subs, *subs2, **head;
+ Destlist *subs, *subs2, *subs3, **head;
Code_t retval;
#if 0
}
} else {
if (!realm) {
- ZRealm *remrealm =
+ Realm *remrealm =
realm_get_realm_by_name(subs->dest.recip->string + 1);
if (remrealm) {
Destlist *sub = (Destlist *) malloc(sizeof(Destlist));
sub->dest.classname->string, sub->dest.inst->string,
sub->dest.recip->string, remrealm->name));
#endif
- Destlist_insert(&remrealm->remsubs, sub);
+ LIST_INSERT(&remrealm->remsubs, sub);
}
}
}
}
- Destlist_insert(head, subs);
+ LIST_INSERT(head, subs);
}
return ZERR_NONE;
}
/* Called from bdump_recv_loop to decapsulate realm subs */
Code_t
-subscr_realm(ZRealm *realm,
- ZNotice_t *notice)
+subscr_realm(realm, notice)
+ Realm *realm;
+ ZNotice_t *notice;
{
Destlist *newsubs;
/* Like realm_sendit, this only takes one item from subs */
static void
-subscr_unsub_sendit(Client *who,
- Destlist *subs,
- ZRealm *realm)
+subscr_unsub_sendit(who, subs, realm)
+ Client *who;
+ Destlist *subs;
+ Realm *realm;
{
ZNotice_t unotice;
Code_t retval;
char **list;
char *pack;
int packlen;
+ int found = 0;
Destlist *subsp, *subsn;
for (subsp = realm->remsubs; subsp; subsp = subsn) {
subsp->dest.classname->string, subsp->dest.inst->string,
subsp->dest.recip->string, realm->name));
#endif
- Destlist_delete(subsp);
+ LIST_DELETE(subsp);
free_subscription(subsp);
break;
}
/* Called from bump_send_loop by way of realm_send_realms */
Code_t
-subscr_send_realm_subs(ZRealm *realm)
+subscr_send_realm_subs(realm)
+ Realm *realm;
{
int i = 0;
Destlist *subs, *next;
}
Code_t
-subscr_realm_subs(ZRealm *realm)
+subscr_realm_subs(realm)
+ Realm *realm;
{
+ int i = 0;
Destlist *subs, *next;
+ char buf[512];
char *text[2 + NUM_FIELDS];
unsigned short num = 0;
Code_t retval;
/* Called from subscr_foreign_user for REALM_REQ_SUBSCRIBE */
static Code_t
-subscr_check_foreign_subs(ZNotice_t *notice,
- struct sockaddr_in *who,
- Server *server,
- ZRealm *realm,
- Destlist *newsubs)
+subscr_check_foreign_subs(notice, who, server, realm, newsubs)
+ ZNotice_t *notice;
+ struct sockaddr_in *who;
+ Server *server;
+ Realm *realm;
+ Destlist *newsubs;
{
- Destlist *subs, *next;
+ Destlist *subs, *subs2, *next;
Acl *acl;
char **text;
int found = 0;
found = 0;
for (subs = newsubs; subs; subs = next) {
- ZRealm *rlm;
+ Realm *rlm;
next=subs->next;
if (subs->dest.recip->string[0] != '\0') {
rlm = realm_which_realm(who);
return retval;
}
}
- Destlist_insert(&realm->subs, subs);
+ LIST_INSERT(&realm->subs, subs);
}
/* don't send confirmation if we're not the initial server contacted */
if (!(server_which_server(who) || found == 0)) {
}
/* Called from realm_control_dispatch for REALM_REQ/ADD_SUBSCRIBE */
-Code_t subscr_foreign_user(ZNotice_t *notice,
- struct sockaddr_in *who,
- Server *server,
- ZRealm *realm)
+Code_t subscr_foreign_user(notice, who, server, realm)
+ ZNotice_t *notice;
+ struct sockaddr_in *who;
+ Server *server;
+ Realm *realm;
{
Destlist *newsubs, *temp;
+ Acl *acl;
Code_t status;
Client *client;
ZNotice_t snotice;
newwho.sin_addr.s_addr = inet_addr(cp);
if (newwho.sin_addr.s_addr == -1) {
- syslog(LOG_ERR, "malformed addr from %s", notice->z_sender);
+ syslog(LOG_ERR, "malformed addr from %s, notice->z_sender");
return(ZERR_NONE);
}
temp->dest.recip = make_string(rlm_recipient, 0);
}
- status = subscr_add_raw(client, (ZRealm *)0, newsubs);
+ status = subscr_add_raw(client, (Realm *)0, newsubs);
} else if (!strcmp(snotice.z_opcode, REALM_REQ_SUBSCRIBE)) {
zdbug((LOG_DEBUG, "subscr_foreign_user REQ %s/%s", tp0, tp1));
status = subscr_check_foreign_subs(notice, who, server, realm, newsubs);
projects / 1ts-debian.git / blobdiff