forked from ppp-project/ppp
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
On request on behalf of Paul Mackerras, copyright in multilink.h and …
…options.h should be his Signed-off-by: Eivind Næss <[email protected]>
- Loading branch information
Showing
2 changed files
with
22 additions
and
46 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| /* | ||
| * multilink.h - Defines for multilink support in pppd. | ||
| * multilink.h - support routines for multilink. | ||
| * | ||
| * Copyright (c) 1984-2000 Carnegie Mellon University. All rights reserved. | ||
| * Copyright (c) 2000-2002 Paul Mackerras. All rights reserved. | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions | ||
|
|
@@ -10,31 +10,19 @@ | |
| * 1. Redistributions of source code must retain the above copyright | ||
| * notice, this list of conditions and the following disclaimer. | ||
| * | ||
| * 2. Redistributions in binary form must reproduce the above copyright | ||
| * notice, this list of conditions and the following disclaimer in | ||
| * the documentation and/or other materials provided with the | ||
| * distribution. | ||
| * | ||
| * 3. The name "Carnegie Mellon University" must not be used to | ||
| * 2. The name(s) of the authors of this software must not be used to | ||
| * endorse or promote products derived from this software without | ||
| * prior written permission. For permission or any legal | ||
| * details, please contact | ||
| * Office of Technology Transfer | ||
| * Carnegie Mellon University | ||
| * 5000 Forbes Avenue | ||
| * Pittsburgh, PA 15213-3890 | ||
| * (412) 268-4387, fax: (412) 268-7395 | ||
| * [email protected] | ||
| * prior written permission. | ||
| * | ||
| * 4. Redistributions of any form whatsoever must retain the following | ||
| * 3. Redistributions of any form whatsoever must retain the following | ||
| * acknowledgment: | ||
| * "This product includes software developed by Computing Services | ||
| * at Carnegie Mellon University (http://www.cmu.edu/computing/)." | ||
| * "This product includes software developed by Paul Mackerras | ||
| * <[email protected]>". | ||
| * | ||
| * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO | ||
| * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO | ||
| * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY | ||
| * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE | ||
| * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES | ||
| * AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY | ||
| * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES | ||
| * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN | ||
| * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING | ||
| * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| /* | ||
| * options.h - Options for pppd | ||
| * options.h - header declarations for option processing for PPP. | ||
| * | ||
| * Copyright (c) 1984-2000 Carnegie Mellon University. All rights reserved. | ||
| * Copyright (c) 2000-2002 Paul Mackerras. All rights reserved. | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions | ||
|
|
@@ -10,31 +10,19 @@ | |
| * 1. Redistributions of source code must retain the above copyright | ||
| * notice, this list of conditions and the following disclaimer. | ||
| * | ||
| * 2. Redistributions in binary form must reproduce the above copyright | ||
| * notice, this list of conditions and the following disclaimer in | ||
| * the documentation and/or other materials provided with the | ||
| * distribution. | ||
| * | ||
| * 3. The name "Carnegie Mellon University" must not be used to | ||
| * 2. The name(s) of the authors of this software must not be used to | ||
| * endorse or promote products derived from this software without | ||
| * prior written permission. For permission or any legal | ||
| * details, please contact | ||
| * Office of Technology Transfer | ||
| * Carnegie Mellon University | ||
| * 5000 Forbes Avenue | ||
| * Pittsburgh, PA 15213-3890 | ||
| * (412) 268-4387, fax: (412) 268-7395 | ||
| * [email protected] | ||
| * prior written permission. | ||
| * | ||
| * 4. Redistributions of any form whatsoever must retain the following | ||
| * 3. Redistributions of any form whatsoever must retain the following | ||
| * acknowledgment: | ||
| * "This product includes software developed by Computing Services | ||
| * at Carnegie Mellon University (http://www.cmu.edu/computing/)." | ||
| * "This product includes software developed by Paul Mackerras | ||
| * <[email protected]>". | ||
| * | ||
| * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO | ||
| * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO | ||
| * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY | ||
| * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE | ||
| * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES | ||
| * AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY | ||
| * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES | ||
| * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN | ||
| * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING | ||
| * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | ||
|
|
@@ -44,8 +32,8 @@ | |
| #define PPP_OPTIONS_H | ||
|
|
||
| enum opt_type { | ||
| o_special_noarg = 0, | ||
| o_special = 1, | ||
| o_special_noarg, | ||
| o_special, | ||
| o_bool, | ||
| o_int, | ||
| o_uint32, | ||
|
|
||