- dtucker@cvs.openbsd.org 2010/01/09 11:17:56

[openssh.git] / loginrec.h

diff --git a/loginrec.h b/loginrec.h
index 03dc3a84d37e46b9a0ac3d523082a5d8ad629776..859e1a63049b39cf0194af54f6acf5cf7229b118 100644 (file)
--- a/loginrec.h
+++ b/loginrec.h
@@ -12,11 +12,6 @@
  * 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. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Markus Friedl.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -30,18 +25,12 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/** 
+/**
  ** loginrec.h:  platform-independent login recording and lastlog retrieval
  **/
 
 #include "includes.h"
 
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <sys/socket.h>
-
-/* RCSID("$Id$"); */
-
 /**
  ** you should use the login_* calls to work around platform dependencies
  **/
@@ -56,11 +45,9 @@ union login_netinfo {
        struct sockaddr_storage sa_storage;
 };
 
-
 /*
  *   * logininfo structure  *
  */
-
 /* types - different to utmp.h 'type' macros */
 /* (though set to the same value as linux, openbsd and others...) */
 #define LTYPE_LOGIN    7
@@ -69,60 +56,63 @@ union login_netinfo {
 /* string lengths - set very long */
 #define LINFO_PROGSIZE 64
 #define LINFO_LINESIZE 64
-#define LINFO_NAMESIZE 64
+#define LINFO_NAMESIZE 128
 #define LINFO_HOSTSIZE 256
 
 struct logininfo {
-
        char       progname[LINFO_PROGSIZE];     /* name of program (for PAM) */
        int        progname_null;
-
        short int  type;                         /* type of login (LTYPE_*) */
-  
        int        pid;                          /* PID of login process */
        int        uid;                          /* UID of this user */
        char       line[LINFO_LINESIZE];         /* tty/pty name */
        char       username[LINFO_NAMESIZE];     /* login username */
        char       hostname[LINFO_HOSTSIZE];     /* remote hostname */
-
        /* 'exit_status' structure components */
        int        exit;                        /* process exit status */
        int        termination;                 /* process termination status */
-  
        /* struct timeval (sys/time.h) isn't always available, if it isn't we'll
         * use time_t's value as tv_sec and set tv_usec to 0
         */
        unsigned int tv_sec;
-       unsigned int tv_usec;                   
-
+       unsigned int tv_usec;
        union login_netinfo hostaddr;       /* caller's host address(es) */
 }; /* struct logininfo */
 
-
 /*
  * login recording functions
  */
+
+/** 'public' functions */
+
 /* construct a new login entry */
 struct logininfo *login_alloc_entry(int pid, const char *username,
                                    const char *hostname, const char *line);
 /* free a structure */
 void login_free_entry(struct logininfo *li);
 /* fill out a pre-allocated structure with useful information */
-int login_init_entry(struct logininfo *li, int pid, const char *username, 
+int login_init_entry(struct logininfo *li, int pid, const char *username,
                     const char *hostname, const char *line);
 /* place the current time in a logininfo struct */
 void login_set_current_time(struct logininfo *li);
 
-/* set the network address based on network address type */
-void login_set_addr(struct logininfo *li, const struct sockaddr *sa,
-                   const unsigned int sa_size);
-
 /* record the entry */
-int login_write (struct logininfo *li);
 int login_login (struct logininfo *li);
 int login_logout(struct logininfo *li);
+#ifdef LOGIN_NEEDS_UTMPX
+int login_utmp_only(struct logininfo *li);
+#endif
+
+/** End of public functions */
+
+/* record the entry */
+int login_write (struct logininfo *li);
 int login_log_entry(struct logininfo *li);
 
+/* set the network address based on network address type */
+void login_set_addr(struct logininfo *li, const struct sockaddr *sa,
+                   const unsigned int sa_size);
+
 /*
  * lastlog retrieval functions
  */
@@ -132,10 +122,10 @@ struct logininfo *login_get_lastlog(struct logininfo *li, const int uid);
 unsigned int login_get_lastlog_time(const int uid);
 
 /* produce various forms of the line filename */
-char *line_fullname(char *dst, const char *src, int dstsize);
+char *line_fullname(char *dst, const char *src, u_int dstsize);
 char *line_stripname(char *dst, const char *src, int dstsize);
 char *line_abbrevname(char *dst, const char *src, int dstsize);
 
+void record_failed_login(const char *, const char *, const char *);
 
 #endif /* _HAVE_LOGINREC_H_ */
-