3882 remove xmod & friends

@@ -305,11 +305,10 @@
     int result;
 #endif /* _SUN_SDK_ */
     unsigned i;
     size_t total_size = 0;
 
-    /* EXPORT DELETE START */
     if (!conn) return SASL_BADPARAM;
     if (! invec || ! output || ! outputlen || numiov < 1)
         PARAMERROR(conn);
 
     if(!conn->props.maxbufsize) {

@@ -346,21 +345,18 @@
         if(result != SASL_OK) INTERROR(conn, result);
        
         *output = conn->encode_buf->data;
         *outputlen = conn->encode_buf->curlen;
 
-    /* CRYPT DELETE START */
 #ifdef _INTEGRATED_SOLARIS_
     } else if (!conn->sun_reg) {
             INTERROR(conn, SASL_FAIL);
 #endif /* _INTEGRATED_SOLARIS_ */
-    /* CRYPT DELETE END */
     } else {
         result = conn->oparams.encode(conn->context, invec, numiov,
                                       output, outputlen);
     }
-    /* EXPORT DELETE END */
 
     RETURN(conn, result);
 }
  
 /* output is only valid until next call to sasl_decode */

@@ -367,11 +363,10 @@
 int sasl_decode(sasl_conn_t *conn,
                 const char *input, unsigned inputlen,
                 const char **output, unsigned *outputlen)
 {
     int result;
-    /* EXPORT DELETE START */
 #ifdef _SUN_SDK_
     const _sasl_global_context_t *gctx;
 #endif /* _SUN_SDK_ */
 
     if(!conn) return SASL_BADPARAM;

@@ -421,16 +416,14 @@
         conn->decode_buf[inputlen] = '\0';
         *output = conn->decode_buf;
         *outputlen = inputlen;
         
         return SASL_OK;
-    /* CRYPT DELETE START */
 #ifdef _INTEGRATED_SOLARIS_
     } else if (!conn->sun_reg) {
             INTERROR(conn, SASL_FAIL);
 #endif /* _INTEGRATED_SOLARIS_ */
-    /* CRYPT DELETE END */
     } else {
         result = conn->oparams.decode(conn->context, input, inputlen,
                                       output, outputlen);
 
         /* NULL an empty buffer (for misbehaved applications) */

@@ -437,11 +430,10 @@
         if (*outputlen == 0) *output = NULL;
 
         RETURN(conn, result);
     }
 
-    /* EXPORT DELETE END */
 #ifdef _SUN_SDK_
     return SASL_FAIL;
 #else
     INTERROR(conn, SASL_FAIL);
 #endif  /* _SUN_SDK_ */

@@ -745,18 +737,14 @@
   if (! pvalue) PARAMERROR(conn);
 
   switch(propnum)
   {
   case SASL_SSF:
-    /* EXPORT DELETE START */
-    /* CRYPT DELETE START */
 #ifdef _INTEGRATED_SOLARIS_
       if (!conn->sun_reg)
         conn->oparams.mech_ssf = 0;
 #endif /* _INTEGRATED_SOLARIS_ */
-    /* CRYPT DELETE END */
-    /* EXPORT DELETE END */
       *(sasl_ssf_t **)pvalue= &conn->oparams.mech_ssf;
       break;      
   case SASL_MAXOUTBUF:
       *(unsigned **)pvalue = &conn->oparams.maxoutbuf;
       break;

@@ -1302,12 +1290,10 @@
     snprintf(conn->errdetail_buf, need_len, "%s%s", leader, conn->error_buf);
    
     return conn->errdetail_buf;
 }
 
-/* EXPORT DELETE START */
-/* CRYPT DELETE START */
 #ifdef _INTEGRATED_SOLARIS_
 DEFINE_STATIC_MUTEX(reg_mutex);
 typedef struct reg_list {
         struct reg_list *next;
         void *mech;

@@ -1351,12 +1337,10 @@
                 reg_list_base = r;
                 UNLOCK_MUTEX(&reg_mutex);
         }
 }
 #endif /* _INTEGRATED_SOLARIS_ */
-/* CRYPT DELETE END */
-/* EXPORT DELETE END */
 
 /* Note that this needs the global callbacks, so if you don't give getcallbacks
  * a sasl_conn_t, you're going to need to pass it yourself (or else we couldn't
  * have client and server at the same time */
 static int _sasl_global_getopt(void *context,

@@ -1372,21 +1356,17 @@
 #endif /* _SUN_SDK_ */
 
   global_callbacks = (const sasl_global_callbacks_t *) context;
 
 #ifdef _SUN_SDK_
-  /* EXPORT DELETE START */
-  /* CRYPT DELETE START */
 #ifdef _INTEGRATED_SOLARIS_
   if (strcmp("reg_sun_plug", option) == 0) {
         *result = (const char *)_register_plugin;
         *len = 0;
         return (SASL_OK);
   }
 #endif /* _INTEGRATED_SOLARIS_ */
-  /* CRYPT DELETE END */
-  /* EXPORT DELETE END */
 
   if (global_callbacks)
     gctx = global_callbacks->gctx;
   else
     gctx = _sasl_gbl_ctx();

@@ -2694,12 +2674,10 @@
     *conf = SASL_CONFDIR;
 
     return SASL_OK;
 }
 
-/* EXPORT DELETE START */
-/* CRYPT DELETE START */
 #ifdef _INTEGRATED_SOLARIS_
 #pragma fini(sasl_fini)
 int 
 sasl_fini(void) 
 { 

@@ -2711,12 +2689,10 @@
         reg_list_base = next;
     }
     return (0);
 } 
 #endif /* _INTEGRATED_SOLARIS_ */
-/* CRYPT DELETE END */
-/* EXPORT DELETE END */
 
 #endif /* _SUN_SDK_ */
 
 #ifndef WIN32
 static int