-#define UPAPSS_CLOSED 1 /* Connection down */
-#define UPAPSS_LISTEN 2 /* Listening for an Authenticate */
-#define UPAPSS_OPEN 3 /* We've sent an Ack */
-
-/*
- * Flags.
- */
-#define UPAPF_LOWERUP 1 /* The lower level is UP */
-#define UPAPF_AWPPENDING 2 /* Auth with peer pending */
-#define UPAPF_APPENDING 4 /* Auth peer pending */
-#define UPAPF_UPVALID 8 /* User/passwd values valid */
-#define UPAPF_UPPENDING 0x10 /* User/passwd values pending */
+#define UPAPSS_INITIAL 0 /* Connection down */
+#define UPAPSS_CLOSED 1 /* Connection up, haven't requested auth */
+#define UPAPSS_PENDING 2 /* Connection down, have requested auth */
+#define UPAPSS_LISTEN 3 /* Listening for an Authenticate */
+#define UPAPSS_OPEN 4 /* We've sent an Ack */
+#define UPAPSS_BADAUTH 5 /* We've sent a Nak */