projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
updated ali-flist, with batch edit of others
[mmh]
/
uip
/
send.c
diff --git
a/uip/send.c
b/uip/send.c
index
2370ea4
..
bf689f0
100644
(file)
--- a/
uip/send.c
+++ b/
uip/send.c
@@
-11,6
+11,12
@@
#include <signal.h>
#include <signal.h>
+#ifndef CYRUS_SASL
+# define SASLminc(a) (a)
+#else /* CYRUS_SASL */
+# define SASLminc(a) 0
+#endif /* CYRUS_SASL */
+
static struct swit switches[] = {
#define ALIASW 0
{ "alias aliasfile", 0 },
static struct swit switches[] = {
#define ALIASW 0
{ "alias aliasfile", 0 },
@@
-67,7
+73,7
@@
static struct swit switches[] = {
#define VERSIONSW 26
{ "version", 0 },
#define HELPSW 27
#define VERSIONSW 26
{ "version", 0 },
#define HELPSW 27
- { "help", 4 },
+ { "help", 0 },
#define BITSTUFFSW 28
{ "dashstuffing", -12 },
#define NBITSTUFFSW 29
#define BITSTUFFSW 28
{ "dashstuffing", -12 },
#define NBITSTUFFSW 29
@@
-86,6
+92,12
@@
static struct swit switches[] = {
{ "server host", -6 },
#define SNOOPSW 36
{ "snoop", -5 },
{ "server host", -6 },
#define SNOOPSW 36
{ "snoop", -5 },
+#define SASLSW 37
+ { "sasl", SASLminc(-4) },
+#define SASLMECHSW 38
+ { "saslmech", SASLminc(-5) },
+#define USERSW 39
+ { "user", SASLminc(-4) },
{ NULL, 0 }
};
{ NULL, 0 }
};
@@
-241,6
+253,7
@@
main (int argc, char **argv)
case SENDSW:
case SOMLSW:
case SNOOPSW:
case SENDSW:
case SOMLSW:
case SNOOPSW:
+ case SASLSW:
vec[vecp++] = --cp;
continue;
vec[vecp++] = --cp;
continue;
@@
-249,6
+262,8
@@
main (int argc, char **argv)
case WIDTHSW:
case CLIESW:
case SERVSW:
case WIDTHSW:
case CLIESW:
case SERVSW:
+ case SASLMECHSW:
+ case USERSW:
vec[vecp++] = --cp;
if (!(cp = *argp++) || *cp == '-')
adios (NULL, "missing argument to %s", argp[-2]);
vec[vecp++] = --cp;
if (!(cp = *argp++) || *cp == '-')
adios (NULL, "missing argument to %s", argp[-2]);
@@
-428,5
+443,5
@@
go_to_it:
}
context_save (); /* save the context file */
}
context_save (); /* save the context file */
- done (status);
+ return done (status);
}
}