diff options
author | Stefan Walter <stefw@src.gnome.org> | 2009-01-17 23:27:10 +0000 |
---|---|---|
committer | Stefan Walter <stefw@src.gnome.org> | 2009-01-17 23:27:10 +0000 |
commit | 8275e87c00dee20cef93fe43859146625b4e0125 (patch) | |
tree | a51ac95811071e22acc0fda7ead6e0254dea5002 /pam/gkr-pam-client.c | |
parent | 9ecb5005899a9fd5cd1575b5d10f294cf126d24b (diff) | |
download | gnome-keyring-8275e87c00dee20cef93fe43859146625b4e0125.tar.gz |
Consolidate truly common functionality into 'egg' library. Many more files
* egg/egg-asn1.c: (moved from pkcs11/gck/gck-data-asn1.c)
* egg/egg-asn1.h: (moved from pkcs11/gck/gck-data-asn1.h)
* egg/egg-buffer.c: (moved from common/gkr-buffer.c)
* egg/egg-buffer.h: (moved from common/gkr-buffer.h)
* egg/egg-secure-memory.c: (moved from common/gkr-secure-memory.c)
* egg/egg-secure-memory.h: (moved from common/gkr-secure-memory.h)
* egg/egg-unix-credentials.c: (moved from common/gkr-unix-credentials.c)
* egg/egg-unix-credentials.h: (moved from common/gkr-unix-credentials.h)
* egg/Makefile.am: (added)
* egg/pk.asn: (moved from pkcs11/gck/pk.asn)
* egg/pkix.asn: (moved from pkcs11/gck/pkix.asn)
* egg/tests/Makefile.am: (added)
* egg/tests/test.asn: (moved from pkcs11/gck/tests/test.asn)
* egg/tests/unit-test-asn1.c: (moved from pkcs11/gck/tests/unit-test-data-asn1.c)
* egg/tests/unit-test-secmem.c: (moved from common/tests/unit-test-secmem.c)
* egg/tests/test-data: (added) Consolidate truly common functionality into 'egg'
library. Many more files touched due to above changes.
svn path=/trunk/; revision=1461
Diffstat (limited to 'pam/gkr-pam-client.c')
-rw-r--r-- | pam/gkr-pam-client.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/pam/gkr-pam-client.c b/pam/gkr-pam-client.c index e5ae1d92..8ff890b7 100644 --- a/pam/gkr-pam-client.c +++ b/pam/gkr-pam-client.c @@ -25,8 +25,8 @@ #include "gkr-pam.h" -#include "common/gkr-buffer.h" -#include "common/gkr-unix-credentials.h" +#include "egg/egg-buffer.h" +#include "egg/egg-unix-credentials.h" #include <sys/types.h> #include <sys/socket.h> @@ -128,7 +128,7 @@ static int write_credentials_byte (int sock) { for (;;) { - if (gkr_unix_credentials_write (sock) < 0) { + if (egg_unix_credentials_write (sock) < 0) { if (errno == EINTR || errno == EAGAIN) continue; syslog (GKR_LOG_ERR, "couldn't send credentials to daemon: %s", @@ -288,9 +288,9 @@ keyring_daemon_op (const char *socket, GnomeKeyringOpCode op, int argc, } /* Send the application packet / name */ - gkr_buffer_encode_uint32 (buf, PAM_APP_NAME_LEN + 8); + egg_buffer_encode_uint32 (buf, PAM_APP_NAME_LEN + 8); write_part (sock, buf, 4, &ret); - gkr_buffer_encode_uint32 (buf, PAM_APP_NAME_LEN); + egg_buffer_encode_uint32 (buf, PAM_APP_NAME_LEN); write_part (sock, buf, 4, &ret); write_part (sock, (unsigned char*)PAM_APP_NAME, PAM_APP_NAME_LEN, &ret); @@ -300,9 +300,9 @@ keyring_daemon_op (const char *socket, GnomeKeyringOpCode op, int argc, oplen += 4 + strlen (argv[i]); /* Write out the length, and op */ - gkr_buffer_encode_uint32 (buf, oplen); + egg_buffer_encode_uint32 (buf, oplen); write_part (sock, buf, 4, &ret); - gkr_buffer_encode_uint32 (buf, op); + egg_buffer_encode_uint32 (buf, op); write_part (sock, buf, 4, &ret); /* And now the arguments */ @@ -311,7 +311,7 @@ keyring_daemon_op (const char *socket, GnomeKeyringOpCode op, int argc, l = 0x7FFFFFFF; else l = strlen (argv[i]); - gkr_buffer_encode_uint32 (buf, l); + egg_buffer_encode_uint32 (buf, l); write_part (sock, buf, 4, &ret); if (argv[i] != NULL) write_part (sock, (unsigned char*)argv[i], l, &ret); @@ -327,7 +327,7 @@ keyring_daemon_op (const char *socket, GnomeKeyringOpCode op, int argc, } /* We only support simple responses */ - l = gkr_buffer_decode_uint32 (buf); + l = egg_buffer_decode_uint32 (buf); if (l != 8) { syslog (GKR_LOG_ERR, "invalid length response from gnome-keyring-daemon: %d", l); ret = GNOME_KEYRING_RESULT_IO_ERROR; @@ -338,7 +338,7 @@ keyring_daemon_op (const char *socket, GnomeKeyringOpCode op, int argc, ret = GNOME_KEYRING_RESULT_IO_ERROR; goto done; } - ret = gkr_buffer_decode_uint32 (buf); + ret = egg_buffer_decode_uint32 (buf); done: if (sock >= 0) |