# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
# Use is subject to license terms.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
# to deal in the Software without restriction, including without limitation
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
# and/or sell copies of the Software, and to permit persons to whom the
# Software is furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice (including the next
# paragraph) shall be included in all copies or substantial portions of the
# Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
--- src/sm_manager.c.orig	2007-05-13 05:47:12.000000000 -0400
+++ src/sm_manager.c	2008-02-09 02:08:47.516426000 -0500
@@ -43,11 +43,10 @@
 #endif
 
 extern IcePaAuthStatus _IcePaMagicCookie1Proc ();
-extern void _SmsProcessMessage ();
 
 
 
-static Status
+Status
 _SmsProtocolSetupProc (IceConn    iceConn,
 		       int majorVersion,
 		       int minorVersion,
@@ -129,15 +128,6 @@
 char 		 		*errorStringRet;
 
 {
-    const char *auth_names[] = {"MIT-MAGIC-COOKIE-1"};
-    IcePaAuthProc auth_procs[] = {_IcePaMagicCookie1Proc};
-    int auth_count = 1;
-
-    IcePaVersionRec versions[] = {
-        {SmProtoMajor, SmProtoMinor, _SmsProcessMessage}
-    };
-    int version_count = 1;
-
     if (errorStringRet && errorLength > 0)
 	*errorStringRet = '\0';
 
@@ -157,8 +147,8 @@
     {
 
 	if ((_SmsOpcode = IceRegisterForProtocolReply ("XSMP",
-	    vendor, release, version_count, versions,
-	    auth_count, auth_names, auth_procs, hostBasedAuthProc,
+	    vendor, release, _SmVersionCount, _SmsVersions,
+	    _SmAuthCount, _SmAuthNames, _SmsAuthProcs, hostBasedAuthProc,
 	    _SmsProtocolSetupProc,
 	    NULL,	/* IceProtocolActivateProc - we don't care about
 			   when the Protocol Reply is sent, because the