3 files changed, 12 insertions, 6 deletions
diff --git a/usr/src/cmd/ssh/include/groupaccess.h b/usr/src/cmd/ssh/include/groupaccess.h
index 19553054d5..bc40898888 100644
--- a/usr/src/cmd/ssh/include/groupaccess.h
+++ b/usr/src/cmd/ssh/include/groupaccess.h
@@ -3,8 +3,6 @@
 #ifndef	_GROUPACCESS_H
 #define	_GROUPACCESS_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -38,6 +36,7 @@ extern "C" {
 
 int	 ga_init(const char *, gid_t);
 int	 ga_match(char * const *, int);
+int	 ga_match_pattern_list(const char *);
 void	 ga_free(void);
 
 #ifdef __cplusplus
diff --git a/usr/src/cmd/ssh/include/match.h b/usr/src/cmd/ssh/include/match.h
index 6e3611dfa8..81729c33da 100644
--- a/usr/src/cmd/ssh/include/match.h
+++ b/usr/src/cmd/ssh/include/match.h
@@ -3,8 +3,6 @@
 #ifndef	_MATCH_H
 #define	_MATCH_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -29,6 +27,9 @@ int	 match_host_and_ip(const char *, const char *, const char *);
 int	 match_user(const char *, const char *, const char *, const char *);
 char	*match_list(const char *, const char *, u_int *);
 
+/* addrmatch.c */
+int	 addr_match_list(const char *, const char *);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/usr/src/cmd/ssh/include/servconf.h b/usr/src/cmd/ssh/include/servconf.h
index f222b8596d..1058d00b47 100644
--- a/usr/src/cmd/ssh/include/servconf.h
+++ b/usr/src/cmd/ssh/include/servconf.h
@@ -167,9 +167,15 @@ typedef struct {
 }       ServerOptions;
 
 void	 initialize_server_options(ServerOptions *);
-void	 read_server_config(ServerOptions *, const char *);
 void	 fill_default_server_options(ServerOptions *);
-int	 process_server_config_line(ServerOptions *, char *, const char *, int);
+int	 process_server_config_line(ServerOptions *, char *, const char *, int,
+	     int *, const char *, const char *, const char *);
+void	 load_server_config(const char *, Buffer *);
+void	 parse_server_config(ServerOptions *, const char *, Buffer *,
+	     const char *, const char *, const char *);
+void	 parse_server_match_config(ServerOptions *, const char *, const char *,
+	     const char *);
+void	 copy_set_server_options(ServerOptions *, ServerOptions *, int);
 int	 chroot_requested(char *chroot_directory);
 
 #ifdef __cplusplus