src/usr.bin/ssh/auth-options.h - diff

Return to auth-options.h CVS log

Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/auth-options.h between version 1.24 and 1.25

-version 1.24, 2018/03/03 03:06:02
+version 1.25, 2018/03/03 03:15:51
 Line 1
 Line 1
 Line 1
  /* $OpenBSD$ */
  /*
-  * Author: Tatu Ylonen <ylo@cs.hut.fi>
+  * Copyright (c) 2018 Damien Miller <djm@mindrot.org>
-  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
-  *                    All rights reserved
   *
-  * As far as I am concerned, the code I have written for this software
+  * Permission to use, copy, modify, and distribute this software for any
-  * can be used freely for any purpose.  Any derived versions of this
+  * purpose with or without fee is hereby granted, provided that the above
-  * software must be clearly marked as such, and if the derived work is
+  * copyright notice and this permission notice appear in all copies.
-  * incompatible with the protocol description in the RFC file, it must be
+  *
-  * called by a name other than "ssh" or "Secure Shell".
+  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  * ANY SPECIAL, DIRECT, 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.
   */
  #ifndef AUTH_OPTIONS_H
-Line 17
+Line 21
 Line 17
 Line 21
  struct passwd;
  struct sshkey;
- /* Linked list of custom environment strings */
- struct envstring {
-         struct envstring *next;
-         char   *s;
- };
- /* Flags that may be set in authorized_keys options. */
- extern int no_port_forwarding_flag;
- extern int no_agent_forwarding_flag;
- extern int no_x11_forwarding_flag;
- extern int no_pty_flag;
- extern int no_user_rc;
- extern char *forced_command;
- extern struct envstring *custom_environment;
- extern int forced_tun_device;
- extern int key_is_cert_authority;
- extern char *authorized_principals;
- int     auth_parse_options(struct passwd *, char *, const char *, u_long);
- void    auth_clear_options(void);
- int     auth_cert_options(struct sshkey *, struct passwd *, const char **);
- /* authorized_keys options handling */
  /*
   * sshauthopt represents key options parsed from authorized_keys or