From 04aeb6b642d7efa5012ab1bff28b69fc08e7ab9b Mon Sep 17 00:00:00 2001 From: Mike Khiretskiy Date: Tue, 27 Jan 2015 17:04:01 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B0=20?= =?UTF-8?q?=D0=B2=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D0=B5=20=5Fcl=5Fkeys=20?= =?UTF-8?q?=D0=BF=D1=80=D0=B8=20=D0=BF=D0=BE=D0=BB=D1=83=D1=87=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B8=20=D0=BA=D0=BB=D1=8E=D1=87=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/cl_keys.c | 14 +++++++++----- lib/cl_keys.i | 3 ++- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/lib/cl_keys.c b/lib/cl_keys.c index f26e992..00b37e2 100644 --- a/lib/cl_keys.c +++ b/lib/cl_keys.c @@ -22,24 +22,28 @@ // для работы с ключами #include +// malloc +#include + +#define BUF_SIZE 255 char* getKey(char *login) { - char buffer[255]; - memset(buffer,0,sizeof(buffer)); + char *buffer = (char*) malloc(BUF_SIZE+1); + memset(buffer,0,BUF_SIZE); int ret; // ищем номер пользовательского ключа ret = request_key("user", login, NULL, 0); if (ret < 0) { - return ""; + return buffer; }; // Возвращаем значение ключа - ret = keyctl_read(ret, buffer, sizeof(buffer)); + ret = keyctl_read(ret, buffer, BUF_SIZE); if (ret < 0) { - return ""; + return buffer; }; return buffer; }; diff --git a/lib/cl_keys.i b/lib/cl_keys.i index 4143e09..2390a4f 100644 --- a/lib/cl_keys.i +++ b/lib/cl_keys.i @@ -1,7 +1,8 @@ %module cl_keys +%newobject getKey; %inline %{ /* Put header files here or function declarations like below */ extern char* getKey(char*); extern int clearKey(char*); %} -%include cl_keys.c \ No newline at end of file +%include cl_keys.c