[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
CVS gsasl/lib/src
From: |
gsasl-commit |
Subject: |
CVS gsasl/lib/src |
Date: |
Thu, 18 Nov 2004 14:49:07 +0100 |
Update of /home/cvs/gsasl/lib/src
In directory dopio:/tmp/cvs-serv2913/src
Modified Files:
callback.c error.c gsasl.h.in internal.h obsolete.c property.c
Log Message:
Add CPP definition GSASL_NO_OBSOLETE to hide obsolete code (md5pwd.c still
todo).
--- /home/cvs/gsasl/lib/src/callback.c 2004/10/31 19:48:56 1.16
+++ /home/cvs/gsasl/lib/src/callback.c 2004/11/18 13:49:07 1.17
@@ -82,6 +82,7 @@
if (ctx->cb)
return ctx->cb (ctx, sctx, prop);
+#ifndef GSASL_NO_OBSOLETE
{
/* Call obsolete callbacks. Remove this when the obsolete
* callbacks are no longer supported. */
@@ -136,6 +137,7 @@
break;
}
}
+#endif
return GSASL_NO_CALLBACK;
}
--- /home/cvs/gsasl/lib/src/error.c 2004/09/23 00:49:14 1.9
+++ /home/cvs/gsasl/lib/src/error.c 2004/11/18 13:49:07 1.10
@@ -60,10 +60,6 @@
p = _("SASL mechanism called too many times");
break;
- case GSASL_TOO_SMALL_BUFFER:
- p = _("SASL function need larger buffer (internal error)");
- break;
-
case GSASL_FOPEN_ERROR:
p = _("Could not open file in SASL library");
break;
@@ -80,8 +76,8 @@
p = _("Base 64 coding error in SASL library");
break;
- case GSASL_GCRYPT_ERROR:
- p = _("Gcrypt error in SASL library");
+ case GSASL_CRYPTO_ERROR:
+ p = _("Low-level crypto error in SASL library");
break;
case GSASL_GSSAPI_RELEASE_BUFFER_ERROR:
@@ -155,6 +151,93 @@
"in GSSAPI mechanism but this is currently not implemented.");
break;
+ case GSASL_MECHANISM_PARSE_ERROR:
+ p = _("SASL mechanism could not parse input");
+ break;
+
+ case GSASL_AUTHENTICATION_ERROR:
+ p = _("Error authentication user");
+ break;
+
+ case GSASL_CANNOT_GET_CTX:
+ p = _("Cannot get internal library handle (library error)");
+ break;
+
+ case GSASL_INTEGRITY_ERROR:
+ p = _("Integrity error in application payload");
+ break;
+
+ case GSASL_NO_MORE_REALMS:
+ p = _("No more realms available (non-fatal)");
+ break;
+
+ case GSASL_NO_CLIENT_CODE:
+ p = _("Client-side functionality not available in library "
+ "(application error)");
+ break;
+
+ case GSASL_NO_SERVER_CODE:
+ p = _("Server-side functionality not available in library "
+ "(application error)");
+ break;
+
+ case GSASL_INVALID_HANDLE:
+ p = _("The provided library handle was invalid (application error)");
+ break;
+
+ case GSASL_NO_CALLBACK:
+ p = _("No callback specified by caller (application error).");
+ break;
+
+ case GSASL_NO_ANONYMOUS_TOKEN:
+ p = _("Authentication failed because the "
+ "anonymous token was not provided.");
+ break;
+
+ case GSASL_NO_AUTHID:
+ p = _("Authentication failed because the "
+ "authentication identity was not provided.");
+ break;
+
+ case GSASL_NO_AUTHZID:
+ p = _("Authentication failed because the "
+ "authorization identity was not provided.");
+ break;
+
+ case GSASL_NO_PASSWORD:
+ p = _("Authentication failed because the "
+ "password was not provided.");
+ break;
+
+ case GSASL_NO_PASSCODE:
+ p = _("Authentication failed because the "
+ "passcode was not provided.");
+ break;
+
+ case GSASL_NO_PIN:
+ p = _("Authentication failed because the "
+ "pin code was not provided.");
+ break;
+
+ case GSASL_NO_SERVICE:
+ p = _("Authentication failed because the "
+ "service name was not provided.");
+ break;
+
+ case GSASL_NO_HOSTNAME:
+ p = _("Authentication failed because the "
+ "host name was not provided.");
+ break;
+
+ case GSASL_UNICODE_NORMALIZATION_ERROR:
+ p = _("Failed to perform Unicode Normalization on string.");
+ break;
+
+#ifndef GSASL_NO_OBSOLETE
+ case GSASL_TOO_SMALL_BUFFER:
+ p = _("SASL function need larger buffer (internal error)");
+ break;
+
case GSASL_NEED_CLIENT_ANONYMOUS_CALLBACK:
p =
_
@@ -271,88 +354,7 @@
p = _("SASL mechanism needs gsasl_server_callback_retrieve() "
"callback (application error)");
break;
-
- case GSASL_MECHANISM_PARSE_ERROR:
- p = _("SASL mechanism could not parse input");
- break;
-
- case GSASL_AUTHENTICATION_ERROR:
- p = _("Error authentication user");
- break;
-
- case GSASL_CANNOT_GET_CTX:
- p = _("Cannot get internal library handle (library error)");
- break;
-
- case GSASL_INTEGRITY_ERROR:
- p = _("Integrity error in application payload");
- break;
-
- case GSASL_NO_MORE_REALMS:
- p = _("No more realms available (non-fatal)");
- break;
-
- case GSASL_NO_CLIENT_CODE:
- p = _("Client-side functionality not available in library "
- "(application error)");
- break;
-
- case GSASL_NO_SERVER_CODE:
- p = _("Server-side functionality not available in library "
- "(application error)");
- break;
-
- case GSASL_INVALID_HANDLE:
- p = _("The provided library handle was invalid (application error)");
- break;
-
- case GSASL_NO_CALLBACK:
- p = _("No callback specified by caller (application error).");
- break;
-
- case GSASL_NO_ANONYMOUS_TOKEN:
- p = _("Authentication failed because the "
- "anonymous token was not provided.");
- break;
-
- case GSASL_NO_AUTHID:
- p = _("Authentication failed because the "
- "authentication identity was not provided.");
- break;
-
- case GSASL_NO_AUTHZID:
- p = _("Authentication failed because the "
- "authorization identity was not provided.");
- break;
-
- case GSASL_NO_PASSWORD:
- p = _("Authentication failed because the "
- "password was not provided.");
- break;
-
- case GSASL_NO_PASSCODE:
- p = _("Authentication failed because the "
- "passcode was not provided.");
- break;
-
- case GSASL_NO_PIN:
- p = _("Authentication failed because the "
- "pin code was not provided.");
- break;
-
- case GSASL_NO_SERVICE:
- p = _("Authentication failed because the "
- "service name was not provided.");
- break;
-
- case GSASL_NO_HOSTNAME:
- p = _("Authentication failed because the "
- "host name was not provided.");
- break;
-
- case GSASL_UNICODE_NORMALIZATION_ERROR:
- p = _("Failed to perform Unicode Normalization on string.");
- break;
+#endif
default:
p = _("Libgsasl unknown error");
--- /home/cvs/gsasl/lib/src/gsasl.h.in 2004/10/31 20:29:56 1.45
+++ /home/cvs/gsasl/lib/src/gsasl.h.in 2004/11/18 13:49:07 1.46
@@ -242,8 +242,10 @@
/* Get the mechanism API. */
# include <gsasl-mech.h>
+#ifndef GSASL_NO_OBSOLETE
/* For compatibility with earlier versions. */
# include <gsasl-compat.h>
+#endif
# ifdef __cplusplus
}
--- /home/cvs/gsasl/lib/src/internal.h 2004/10/31 20:13:00 1.22
+++ /home/cvs/gsasl/lib/src/internal.h 2004/11/18 13:49:07 1.23
@@ -45,6 +45,7 @@
/* Callback. */
Gsasl_callback_function cb;
void *application_hook;
+#ifndef GSASL_NO_OBSOLETE
/* Obsolete stuff. */
Gsasl_client_callback_authorization_id cbc_authorization_id;
Gsasl_client_callback_authentication_id cbc_authentication_id;
@@ -69,6 +70,7 @@
Gsasl_server_callback_cipher cbs_cipher;
Gsasl_server_callback_service cbs_service;
Gsasl_server_callback_gssapi cbs_gssapi;
+#endif
};
/* Per-session library handle. */
@@ -89,8 +91,10 @@
char *service;
char *hostname;
char *gssapi_display_name;
+#ifndef GSASL_NO_OBSOLETE
/* Obsolete stuff. */
void *application_data;
+#endif
};
#endif /* INTERNAL_H */
--- /home/cvs/gsasl/lib/src/obsolete.c 2004/11/18 13:07:45 1.16
+++ /home/cvs/gsasl/lib/src/obsolete.c 2004/11/18 13:49:07 1.17
@@ -21,6 +21,8 @@
#include "internal.h"
+#ifndef GSASL_NO_OBSOLETE
+
/**
* gsasl_client_listmech:
* @ctx: libgsasl handle.
@@ -1539,3 +1541,4 @@
{
return ctx ? ctx->cbs_service : NULL;
}
+#endif
--- /home/cvs/gsasl/lib/src/property.c 2004/11/07 16:15:35 1.18
+++ /home/cvs/gsasl/lib/src/property.c 2004/11/18 13:49:07 1.19
@@ -207,6 +207,7 @@
p = gsasl_property_fast (sctx, prop);
}
+#ifndef GSASL_NO_OBSOLETE
if (!p)
{
Gsasl_client_callback_anonymous cb_anonymous;
@@ -320,6 +321,7 @@
}
p = gsasl_property_fast (sctx, prop);
}
+#endif
return p;
}
- CVS gsasl/lib/src, gsasl-commit, 2004/11/07
- CVS gsasl/lib/src, gsasl-commit, 2004/11/18
- CVS gsasl/lib/src, gsasl-commit, 2004/11/18
- CVS gsasl/lib/src, gsasl-commit, 2004/11/18
- CVS gsasl/lib/src,
gsasl-commit <=
- CVS gsasl/lib/src, gsasl-commit, 2004/11/18
- CVS gsasl/lib/src, gsasl-commit, 2004/11/18
- CVS gsasl/lib/src, gsasl-commit, 2004/11/18
- CVS gsasl/lib/src, gsasl-commit, 2004/11/18
- CVS gsasl/lib/src, gsasl-commit, 2004/11/26
- CVS gsasl/lib/src, gsasl-commit, 2004/11/26
- CVS gsasl/lib/src, gsasl-commit, 2004/11/26
- CVS gsasl/lib/src, gsasl-commit, 2004/11/27
- CVS gsasl/lib/src, gsasl-commit, 2004/11/27
- CVS gsasl/lib/src, gsasl-commit, 2004/11/28