summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
authorbrian <brian@FreeBSD.org>1998-10-26 19:07:42 +0000
committerbrian <brian@FreeBSD.org>1998-10-26 19:07:42 +0000
commitca1adcf3bc4c498421cf342fda2d3e2ae3b9b1e5 (patch)
treea97dec13c01e8e0c402b3643c9025572f9293ff6 /usr.sbin
parent2879293691c94fd47031d654d9b7c5f3f788b9e8 (diff)
downloadFreeBSD-src-ca1adcf3bc4c498421cf342fda2d3e2ae3b9b1e5.zip
FreeBSD-src-ca1adcf3bc4c498421cf342fda2d3e2ae3b9b1e5.tar.gz
Shuffle the iface-alias option so that's in alphabetical
order like the rest of the options.
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/ppp/bundle.h18
-rw-r--r--usr.sbin/ppp/command.c10
2 files changed, 14 insertions, 14 deletions
diff --git a/usr.sbin/ppp/bundle.h b/usr.sbin/ppp/bundle.h
index 75722b1..2f3c53d 100644
--- a/usr.sbin/ppp/bundle.h
+++ b/usr.sbin/ppp/bundle.h
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: bundle.h,v 1.15 1998/10/24 01:08:45 brian Exp $
+ * $Id: bundle.h,v 1.16 1998/10/26 19:07:38 brian Exp $
*/
#define PHASE_DEAD 0 /* Link is dead */
@@ -34,14 +34,14 @@
/* cfg.opt bit settings */
#define OPT_IDCHECK 0x0001
-#define OPT_LOOPBACK 0x0002
-#define OPT_PASSWDAUTH 0x0004
-#define OPT_PROXY 0x0008
-#define OPT_PROXYALL 0x0010
-#define OPT_SROUTES 0x0020
-#define OPT_THROUGHPUT 0x0040
-#define OPT_UTMP 0x0080
-#define OPT_IFACEALIAS 0x0100
+#define OPT_IFACEALIAS 0x0002
+#define OPT_LOOPBACK 0x0004
+#define OPT_PASSWDAUTH 0x0008
+#define OPT_PROXY 0x0010
+#define OPT_PROXYALL 0x0020
+#define OPT_SROUTES 0x0040
+#define OPT_THROUGHPUT 0x0080
+#define OPT_UTMP 0x0100
#define MAX_ENDDISC_CLASS 5
diff --git a/usr.sbin/ppp/command.c b/usr.sbin/ppp/command.c
index a3f0d1d..2e432ff 100644
--- a/usr.sbin/ppp/command.c
+++ b/usr.sbin/ppp/command.c
@@ -17,7 +17,7 @@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * $Id: command.c,v 1.170 1998/10/26 19:07:36 brian Exp $
+ * $Id: command.c,v 1.171 1998/10/26 19:07:39 brian Exp $
*
*/
#include <sys/types.h>
@@ -134,7 +134,7 @@
#define NEG_DNS 50
const char Version[] = "2.0";
-const char VersionDate[] = "$Date: 1998/10/26 19:07:36 $";
+const char VersionDate[] = "$Date: 1998/10/26 19:07:39 $";
static int ShowCommand(struct cmdargs const *);
static int TerminalCommand(struct cmdargs const *);
@@ -2178,6 +2178,9 @@ NegotiateSet(struct cmdargs const *arg)
static struct cmdtab const NegotiateCommands[] = {
{"idcheck", NULL, OptSet, LOCAL_AUTH, "Check FSM reply ids",
"disable|enable", (const void *)OPT_IDCHECK},
+ {"iface-alias", NULL, IfaceAliasOptSet, LOCAL_AUTH,
+ "retain interface addresses", "disable|enable",
+ (const void *)OPT_IFACEALIAS},
{"loopback", NULL, OptSet, LOCAL_AUTH, "Loop packets for local iface",
"disable|enable", (const void *)OPT_LOOPBACK},
{"passwdauth", NULL, OptSet, LOCAL_AUTH, "Use passwd file",
@@ -2192,9 +2195,6 @@ static struct cmdtab const NegotiateCommands[] = {
"disable|enable", (const void *)OPT_THROUGHPUT},
{"utmp", NULL, OptSet, LOCAL_AUTH, "Log connections in utmp",
"disable|enable", (const void *)OPT_UTMP},
- {"iface-alias", NULL, IfaceAliasOptSet, LOCAL_AUTH,
- "maintain interface addresses", "disable|enable",
- (const void *)OPT_IFACEALIAS},
#define OPT_MAX 9 /* accept/deny allowed below and not above */
OpenPOWER on IntegriCloud